Check that GDK_IS_SCREEN(screen) (like the X11 backend does), not screen

2005-05-10  Tor Lillqvist  <tml@novell.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 8f36b0c071c378192efc7f00b01fd85578d76275..e76a646502c9715850509e4c9c49921e6ab67134 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8f36b0c071c378192efc7f00b01fd85578d76275..e76a646502c9715850509e4c9c49921e6ab67134 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8f36b0c071c378192efc7f00b01fd85578d76275..e76a646502c9715850509e4c9c49921e6ab67134 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-05-10  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 145271216c0e6b1c9ce430456523f27e32d1ace7..7ce91c6ff1ca550624368eb87e8f827c58d8a543 100644 (file)
--- 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