Commit 14f26357 authored by Richard Hult's avatar Richard Hult Committed by Richard Hult

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
parent 49061dd1
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
......
......@@ -36,7 +36,7 @@ gdk_display_get_default_group (GdkDisplay *display)
void
_gdk_windowing_set_default_display (GdkDisplay *display)
{
g_assert (_gdk_display == display);
g_assert (display == NULL || _gdk_display == display);
}
GdkDisplay *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment