diff options
| author | Tor Lillqvist <tml@iki.fi> | 2009-01-05 15:29:14 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2009-01-05 15:29:14 +0000 |
| commit | 7fa8ece199bc3d5daa5f46ee31c9127e8e013a5a (patch) | |
| tree | 83de50762ce7ac76f260808bac12330ca878885b | |
| parent | 1e51aec0658e7d2444d248cb1bee08cfa070eed4 (diff) | |
| download | gdk-pixbuf-7fa8ece199bc3d5daa5f46ee31c9127e8e013a5a.tar.gz | |
Bug 566628 - gdk_display_close always asserts on win32
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.
svn path=/branches/gtk-2-14/; revision=22066
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gdk/win32/gdkdisplay-win32.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,12 @@ +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. + 2009-01-03 Matthias Clasen <mclasen@redhat.com> Merged from trunk: diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 4d70897a2..b38b7bb7e 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -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 |