gtk+ r21881 - in branches/gtk-2-14: . gdk/x11

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Dec 13 05:33:56 2008
New Revision: 21881
URL: http://svn.gnome.org/viewvc/gtk+?rev=21881&view=rev

Log:
2008-12-13  Matthias Clasen  <mclasen redhat com>

        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




Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/x11/gdkdisplay-x11.c

Modified: branches/gtk-2-14/gdk/x11/gdkdisplay-x11.c
==============================================================================
--- branches/gtk-2-14/gdk/x11/gdkdisplay-x11.c	(original)
+++ branches/gtk-2-14/gdk/x11/gdkdisplay-x11.c	Sat Dec 13 05:33:56 2008
@@ -181,6 +181,8 @@
   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 @@
   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;