From c48d156ee5d231e81eaacfb14cc7a8fdb463842a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 13 Dec 2008 05:33:56 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20563751=20=E2=80=93=20xatom=20cache=20is?= =?UTF-8?q?=20prefilled=20too=20late?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-12-13 Matthias Clasen Bug 563751 – xatom cache is prefilled too late * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize the XAtom cache earlier. Patch by Christian Persch svn path=/branches/gtk-2-14/; revision=21881 --- ChangeLog | 9 +++++++++ gdk/x11/gdkdisplay-x11.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28ea5cb8d2..fe5db62056 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-13 Matthias Clasen + + Merged from trunk: + + Bug 563751 – xatom cache is prefilled too late + + * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize the + XAtom cache earlier. Patch by Christian Persch + 2008-12-13 Matthias Clasen Merged from trunk: diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 154fc556a1..c7bdd1e54a 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -181,6 +181,8 @@ gdk_display_open (const gchar *display_name) XAddConnectionWatch (xdisplay, gdk_internal_connection_watch, NULL); #endif /* HAVE_X11R6 */ + _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms)); + /* RandR must be initialized before we initialize the screens */ display_x11->have_randr12 = FALSE; #ifdef HAVE_RANDR @@ -218,8 +220,6 @@ gdk_display_open (const gchar *display_name) attr.height = 10; attr.event_mask = 0; - _gdk_x11_precache_atoms (display, precache_atoms, G_N_ELEMENTS (precache_atoms)); - display_x11->leader_gdk_window = gdk_window_new (GDK_SCREEN_X11 (display_x11->default_screen)->root_window, &attr, GDK_WA_X | GDK_WA_Y); (_gdk_x11_window_get_toplevel (display_x11->leader_gdk_window))->is_leader = TRUE;