diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-05-10 06:51:44 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-05-10 06:51:44 +0000 |
| commit | 846972ba1486f694291c788cb113453a40b8104d (patch) | |
| tree | a81e22114462791a0f6ce073bd559da2f3c9bd54 | |
| parent | 6aaf568c31ca5e997aabdf04a0143b42809b43ab (diff) | |
| download | gtk+-846972ba1486f694291c788cb113453a40b8104d.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gdk/win32/gdkproperty-win32.c | 2 |
4 files changed, 22 insertions, 1 deletions
@@ -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 8f36b0c071..e76a646502 100644 --- 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 8f36b0c071..e76a646502 100644 --- 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 145271216c..7ce91c6ff1 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 |