From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 18 Jan 2011 14:36:59 +0000 (-0500)
Subject: Don't set the default display to NULL
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=bb7662392d68bb504c46eb6c957e2dc5031932c4;p=~andy%2Fgtk

Don't set the default display to NULL

This was causing segfaults if DISPLAY is unset
---

diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index dd712d929..fbd49464d 100644
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -53,7 +53,7 @@ gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
   GdkDisplay *display;
 
   display = _gdk_x11_display_open (name);
-  if (manager_x11->default_display == NULL)
+  if (manager_x11->default_display == NULL && display != NULL)
     gdk_display_manager_set_default_display (manager, display);
 
   return display;