From edec9a18799e82e9963cee6da1becef886c85e35 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 17 Mar 2007 18:50:20 +0000 Subject: [PATCH] Initialise nxvisuals to 0 in order to handle XGetVisualInfo() failures 2007-03-17 Chris Wilson * gdk/x11/gdkvisual-x11.c (_gdk_visual_init): Initialise nxvisuals to 0 in order to handle XGetVisualInfo() failures gracefully. (#419171) svn path=/branches/gtk-2-10/; revision=17537 --- ChangeLog | 6 ++++++ gdk/x11/gdkvisual-x11.c | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index e3f7f03554..6469374ef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-17 Chris Wilson + + * gdk/x11/gdkvisual-x11.c (_gdk_visual_init): + Initialise nxvisuals to 0 in order to handle + XGetVisualInfo() failures gracefully. (#419171) + 2007-03-16 Matthias Clasen Merge from trunk: diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 724923e330..f281013df1 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -119,6 +119,7 @@ _gdk_visual_init (GdkScreen *screen) g_return_if_fail (GDK_IS_SCREEN (screen)); screen_x11 = GDK_SCREEN_X11 (screen); + nxvisuals = 0; visual_template.screen = screen_x11->screen_num; visual_list = XGetVisualInfo (screen_x11->xdisplay, VisualScreenMask, &visual_template, &nxvisuals);