gtk+ r22066 - in branches/gtk-2-14: . gdk/win32

[tml svn gnome org]

Author: tml
Date: Mon Jan  5 15:29:14 2009
New Revision: 22066
URL: http://svn.gnome.org/viewvc/gtk+?rev=22066&view=rev

Log:
2009-01-05  Tor Lillqvist  <tml iki fi>

	Bug 566628 - gdk_display_close always asserts on win32

	* gdk/win32/gdkdisplay-win32.c
	(_gdk_windowing_set_default_display): Allow also a NULL parameter
	in the g_assert(). Still don't actually do anything in this
	function, though.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/win32/gdkdisplay-win32.c

Modified: branches/gtk-2-14/gdk/win32/gdkdisplay-win32.c
==============================================================================
--- branches/gtk-2-14/gdk/win32/gdkdisplay-win32.c	(original)
+++ branches/gtk-2-14/gdk/win32/gdkdisplay-win32.c	Mon Jan  5 15:29:14 2009
@@ -33,7 +33,7 @@
 void
 _gdk_windowing_set_default_display (GdkDisplay *display)
 {
-  g_assert (_gdk_display == display);
+  g_assert (display == NULL ||_gdk_display == display);
 }
 
 #ifdef HAVE_MONITOR_INFO