Bug 563751 – xatom cache is prefilled too late

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



svn path=/branches/gtk-2-14/; revision=21881
This commit is contained in:
Matthias Clasen
2008-12-13 05:33:56 +00:00
committed by Matthias Clasen
parent 8b1a98a84f
commit c48d156ee5
2 changed files with 11 additions and 2 deletions

View File

@@ -1,3 +1,12 @@
2008-12-13 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com>
Merged from trunk:

View File

@@ -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;