gtk+ r22223 - in trunk: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Mon Jan 26 20:31:18 2009
New Revision: 22223
URL: http://svn.gnome.org/viewvc/gtk+?rev=22223&view=rev

Log:
2009-01-26  Richard Hult  <richard imendio com>

	Bug 566628 â gdk_display_close always asserts on win32 and quartz

	* gdk/quartz/gdkdisplay-quartz.c
	(_gdk_windowing_set_default_display): Copy fix for bug #566628
	from the win32 backend: Allow also a NULL parameter in the
	g_assert().


Modified:
   trunk/ChangeLog
   trunk/gdk/quartz/gdkdisplay-quartz.c

Modified: trunk/gdk/quartz/gdkdisplay-quartz.c
==============================================================================
--- trunk/gdk/quartz/gdkdisplay-quartz.c	(original)
+++ trunk/gdk/quartz/gdkdisplay-quartz.c	Mon Jan 26 20:31:18 2009
@@ -36,7 +36,7 @@
 void
 _gdk_windowing_set_default_display (GdkDisplay *display)
 {
-  g_assert (_gdk_display == display);
+  g_assert (display == NULL || _gdk_display == display);
 }
 
 GdkDisplay *