diff --git a/ChangeLog b/ChangeLog index cfc6853c11..4c971dd9f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-10 Tor Lillqvist + + * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check + that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen + == gdk_screen_get_default(), as that might return NULL when this + function is called. + 2005-05-09 Matthias Clasen * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cfc6853c11..4c971dd9f1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-05-10 Tor Lillqvist + + * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check + that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen + == gdk_screen_get_default(), as that might return NULL when this + function is called. + 2005-05-09 Matthias Clasen * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cfc6853c11..4c971dd9f1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-05-10 Tor Lillqvist + + * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Check + that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen + == gdk_screen_get_default(), as that might return NULL when this + function is called. + 2005-05-09 Matthias Clasen * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index e98b783cf5..996e484430 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -561,7 +561,7 @@ gdk_screen_get_setting (GdkScreen *screen, const gchar *name, GValue *value) { - g_return_val_if_fail (screen == gdk_screen_get_default (), FALSE); + g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); /* * XXX : if these values get changed through the Windoze UI the