[Emacs-diffs] emacs/src gtkutil.c

[Jan Dj�rv]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/03/23 17:09:07

Modified files:
        src            : gtkutil.c 

Log message:
        gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
        that gdpy is set.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.148&r2=1.149

Patches:
Index: gtkutil.c
===================================================================
RCS file: /sources/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- gtkutil.c   14 Mar 2009 15:12:24 -0000      1.148
+++ gtkutil.c   23 Mar 2009 17:09:07 -0000      1.149
@@ -119,9 +119,12 @@
   GdkDisplay *gdpy;
 
   gdpy = gdk_display_open (display_name);
-  if (!gdpy_def)
+  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;