From: Benjamin Otte <otte@redhat.com>
Date: Tue, 19 Feb 2013 18:55:02 +0000 (+0100)
Subject: x11: Handle case where xsettings are NULL
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=de087165260ae2740e73cc3d24f9f18b972d8013

x11: Handle case where xsettings are NULL
---

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 0a9b3cf71..71478926e 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1318,6 +1318,8 @@ gdk_x11_screen_get_setting (GdkScreen   *screen,
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
   const GValue *setting;
 
+  if (x11_screen->xsettings == NULL)
+    goto out;
   setting = g_hash_table_lookup (x11_screen->xsettings, name);
   if (setting == NULL)
     goto out;