summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkscreen-x11.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-08-01 23:43:13 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-08-01 23:43:13 +0000
commit63489392e6c1e452054eb930fa7bd493e51cba9a (patch)
tree3ad603c3bbd2ea819fa025229dd02658fa08fd0e /gdk/x11/gdkscreen-x11.c
parent615deb3e4ad2411c61c6b5ed4c5e445218b139bf (diff)
downloadgdk-pixbuf-63489392e6c1e452054eb930fa7bd493e51cba9a.tar.gz
New demo for window migration between different displays and screens.
Thu Aug 1 19:09:39 2002 Owen Taylor <otaylor@redhat.com> * demos/gtk-demo/changedisplay.c: New demo for window migration between different displays and screens. * gtk/gtkrc.c gtkstyle.[ch]: Add _gtk_style_init_for_settings(), so that gtkrc.c can initialize the styles it creates for the right display. * gdk/gdkdisplaymanager.c (gdk_screen_get_default) * gtk/gtksettings.c (gtk_settings_get_default) * gtk/gtkstyle.c (gtk_style_init): Handle absence of a default screen. * gdk/x11/gdkmain-x11.c (_gdk_windowing_set_default_display): Handle display == NULL.x * gdk/gdkdisplay.c (gdk_display_dispose): Free the event queue. * gdk/x11/gdkevents-x11.c gdk/x11/gdkdisplay-x11.c: Remove the event source when closing a display. * gdk/gdkdisplay.[ch]: Add a ::closed signal, dispose() isn't convenient enough by itself. * gdk/x11/gdkevents-x11.c (gdk_xsettings_watch_cb): Create foreign windows for watch windows if there isn't an existing window, instead of installing a global filter. * gdk/x11/gdkscreen-x11.c gdk/x11/gdkprivate-x11.h gdk/x11/gdkevents-x11.c (_gdk_x11_events_uninit_screen): Clean up the xsettings_client when we are done with it. * gdk/x11/gdkevents-x11.c (_gdk_events_init): Remove excess call to _gdk_x11_events_init_screen()
Diffstat (limited to 'gdk/x11/gdkscreen-x11.c')
-rw-r--r--gdk/x11/gdkscreen-x11.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index cab6a9ad6..9c3526f26 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -232,6 +232,8 @@ gdk_screen_x11_dispose (GObject *object)
{
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
+ _gdk_x11_events_uninit_screen (GDK_SCREEN (object));
+
screen_x11->root_window = NULL;
screen_x11->xdisplay = NULL;
@@ -356,7 +358,6 @@ _gdk_x11_screen_new (GdkDisplay *display,
_gdk_visual_init (screen);
_gdk_windowing_window_init (screen);
- _gdk_x11_events_init_screen (screen);
return screen;
}