Bug 566628 – gdk_display_close always asserts on win32 and quartz

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().

svn path=/trunk/; revision=22223

diff --git a/ChangeLog b/ChangeLog
index e2050e6e94d8ae9c12b02b6d46966e8c2b494cda..40f43edd77c2f2d5c67d5b8b08a04619f8f418e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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().
+

 2009-01-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolitem.[hc]: Export the function to create a proxy
 2009-01-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolitem.[hc]: Export the function to create a proxy

diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 06e2319efcbb76dbc1d0177830bc8f65e4084993..9b83b13b72e81952f32124cfeba6388b1188c9bb 100644 (file)
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -36,7 +36,7 @@ gdk_display_get_default_group (GdkDisplay *display)
 void
 _gdk_windowing_set_default_display (GdkDisplay *display)
 {
 void
 _gdk_windowing_set_default_display (GdkDisplay *display)
 {

-  g_assert (_gdk_display == display);
+  g_assert (display == NULL || _gdk_display == display);

 }
 
 GdkDisplay *
 }
 
 GdkDisplay *