AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 566628 – gdk_display_close always asserts on win32 and quartz

Browse Source 
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
This commit is contained in:
Richard Hult 2009-01-26 20:31:18 +00:00 committed by Richard Hult
parent 49061dd178
commit 14f26357e1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

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

2
gdk/quartz/gdkdisplay-quartz.c
View File

@ -36,7 +36,7 @@ gdk_display_get_default_group (GdkDisplay *display)
void void
_gdk_windowing_set_default_display (GdkDisplay *display) _gdk_windowing_set_default_display (GdkDisplay *display)
{ {
g_assert (_gdk_display == display); g_assert (display == NULL || _gdk_display == display);
} }
GdkDisplay * GdkDisplay *