From 283ce68f8357d18cecab586f8b8fbae19e300def Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 17 Nov 2004 01:21:16 +0000 Subject: [PATCH] Fix a stupid oversight. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkbutton.c | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81f7ab6dc6..e8ac6dffac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkbutton.c: Don't return a relief when a + widget is expected. (#158470, Kazuki IWAMOTO) + Tue Nov 16 19:44:26 2004 Owen Taylor * gdk/x11/gdkevents-x11.c gdk/x11/gdkim-x11.c gdk/x11/gdkwindow-x11.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 81f7ab6dc6..e8ac6dffac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkbutton.c: Don't return a relief when a + widget is expected. (#158470, Kazuki IWAMOTO) + Tue Nov 16 19:44:26 2004 Owen Taylor * gdk/x11/gdkevents-x11.c gdk/x11/gdkim-x11.c gdk/x11/gdkwindow-x11.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 81f7ab6dc6..e8ac6dffac 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkbutton.c: Don't return a relief when a + widget is expected. (#158470, Kazuki IWAMOTO) + Tue Nov 16 19:44:26 2004 Owen Taylor * gdk/x11/gdkevents-x11.c gdk/x11/gdkim-x11.c gdk/x11/gdkwindow-x11.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 81f7ab6dc6..e8ac6dffac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * gtk/gtkbutton.c: Don't return a relief when a + widget is expected. (#158470, Kazuki IWAMOTO) + Tue Nov 16 19:44:26 2004 Owen Taylor * gdk/x11/gdkevents-x11.c gdk/x11/gdkim-x11.c gdk/x11/gdkwindow-x11.c: diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index e73d914bc8..5d2297efd4 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1779,7 +1779,7 @@ gtk_button_get_image (GtkButton *button) { GtkButtonPrivate *priv; - g_return_val_if_fail (GTK_IS_BUTTON (button), GTK_RELIEF_NORMAL); + g_return_val_if_fail (GTK_IS_BUTTON (button), NULL); priv = GTK_BUTTON_GET_PRIVATE (button);