From 14f26357e10fbd9dcf811076b59f7b071f9d25d5 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Mon, 26 Jan 2009 20:31:18 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20566628=20=E2=80=93=20gdk=5Fdisplay=5Fclos?= =?UTF-8?q?e=20always=20asserts=20on=20win32=20and=20quartz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2009-01-26 Richard Hult 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 --- ChangeLog | 9 +++++++++ gdk/quartz/gdkdisplay-quartz.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e2050e6e94..40f43edd77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-01-26 Richard Hult + + 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 * 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 06e2319efc..9b83b13b72 100644 --- 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) { - g_assert (_gdk_display == display); + g_assert (display == NULL || _gdk_display == display); } GdkDisplay *