Fix a stupid oversight.

diff --git a/ChangeLog b/ChangeLog
index 81f7ab6dc6bf1f18bc78de6d24f207d208153be8..e8ac6dffacc3927a7be4d439e61ac463507b4963 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * 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 81f7ab6dc6bf1f18bc78de6d24f207d208153be8..e8ac6dffacc3927a7be4d439e61ac463507b4963 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * 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 81f7ab6dc6bf1f18bc78de6d24f207d208153be8..e8ac6dffacc3927a7be4d439e61ac463507b4963 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * 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 81f7ab6dc6bf1f18bc78de6d24f207d208153be8..e8ac6dffacc3927a7be4d439e61ac463507b4963 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * 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 e73d914bc84fa0840c41017bec826e6990ac18e0..5d2297efd4e1998c1f891999ee565f5fbf503559 100644 (file)
--- 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);