From c7d1a2e836a005c34bd2b691ae517a41c2c49aa7 Mon Sep 17 00:00:00 2001 From: Erwann Chenede Date: Fri, 15 Feb 2002 18:58:17 +0000 Subject: [PATCH] (15/02/02) Erwann Chenede - * gdkdisplay-x11.c, gdkdisplaymgr-x11.c, gdkx.h : made GDK_DISPLAY () return gdk_display instead of calling gdk_x11_get_default_xdisplay as rep-gtk is using GDK_DISPLAY () before initializing fully the gobject type system. --- gdk/x11/gdkdisplay-x11.c | 5 +++++ gdk/x11/gdkdisplaymgr-x11.c | 3 --- gdk/x11/gdkx.h | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 617459685a..25ae8184b6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -198,6 +198,11 @@ GdkDisplay *_gdk_x11_display_impl_display_new (gchar * display_name) return NULL; } +#ifndef GDK_MULTIHEAD_SAFE + gdk_display = display_impl->xdisplay; +#endif + + screen_num = ScreenCount (display_impl->xdisplay); default_screen = DefaultScreenOfDisplay (display_impl->xdisplay); /* populate the screen list and set default */ diff --git a/gdk/x11/gdkdisplaymgr-x11.c b/gdk/x11/gdkdisplaymgr-x11.c index 45c3feb7db..8675c09bee 100644 --- a/gdk/x11/gdkdisplaymgr-x11.c +++ b/gdk/x11/gdkdisplaymgr-x11.c @@ -81,9 +81,6 @@ gdk_display_manager_set_default_display (GdkDisplayManager * display_mgr, g_return_if_fail (GDK_IS_DISPLAY_MANAGER (display_mgr)); g_return_if_fail (GDK_IS_DISPLAY (default_display)); display_mgr->default_display = default_display; -#ifndef GDK_MULTIHEAD_SAFE - gdk_display = GDK_DISPLAY_XDISPLAY (default_display); -#endif } GdkDisplay * diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 5a04c5a727..9507034cd3 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -65,7 +65,9 @@ gint gdk_x11_get_default_screen (void); #define GDK_IMAGE_XDISPLAY(image) (gdk_x11_image_get_xdisplay (image)) #define GDK_IMAGE_XIMAGE(image) (gdk_x11_image_get_ximage (image)) -#define GDK_DISPLAY() gdk_x11_get_default_xdisplay() +#ifndef GDK_MULTIHEAD_SAFE +#define GDK_DISPLAY() gdk_display +#endif #ifdef INSIDE_GDK_X11