summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2009-03-23 17:09:07 +0000
committerJan Djärv <jan.h.d@swipnet.se>2009-03-23 17:09:07 +0000
commitd7b1b3b538f20472b8143d219eaff262acb9c960 (patch)
treefae05f940da33c030082861a085bbd0b37a2255b /src
parent68addc9d7d6176a458cee16d80a5a9726a684a78 (diff)
downloademacs-d7b1b3b538f20472b8143d219eaff262acb9c960.tar.gz
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
that gdpy is set.
Diffstat (limited to 'src')
-rw-r--r--src/gtkutil.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8e3e24b6225..6d73c0358f0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -119,9 +119,12 @@ xg_display_open (display_name, dpy)
GdkDisplay *gdpy;
gdpy = gdk_display_open (display_name);
- if (!gdpy_def)
- gdk_display_manager_set_default_display (gdk_display_manager_get (),
- gdpy);
+ if (!gdpy_def && gdpy)
+ {
+ gdpy_def = gdpy;
+ gdk_display_manager_set_default_display (gdk_display_manager_get (),
+ gdpy);
+ }
*dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
return gdpy != NULL;