diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-09-29 13:42:21 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-09-29 13:42:21 +0000 |
| commit | 56b4314ae94a98b4d785d1190784e20aae0c37b2 (patch) | |
| tree | becb15859584c3655d1b8ab4d1c469713025c298 | |
| parent | f6501cb4bd771df3d2366d197dbc85078a219da8 (diff) | |
| download | gtk+-56b4314ae94a98b4d785d1190784e20aae0c37b2.tar.gz | |
Check arguments. (#317491, Paolo Borelli)
2005-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491,
Paolo Borelli)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gtk/gtkbutton.c | 7 |
3 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2005-09-29 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, + Paolo Borelli) + * gtk/gtkpaned.c (gtk_paned_grab_notify): Stop drags when being grab shadowed. (#317332) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1032e8a85b..8190ac9d9c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-09-29 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkbutton.c (gtk_button_set_image): Check arguments. (#317491, + Paolo Borelli) + * gtk/gtkpaned.c (gtk_paned_grab_notify): Stop drags when being grab shadowed. (#317332) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 134fec6eae..71b53c225d 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1845,7 +1845,12 @@ void gtk_button_set_image (GtkButton *button, GtkWidget *image) { - GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button); + GtkButtonPrivate *priv; + + g_return_if_fail (GTK_IS_BUTTON (button)); + g_return_if_fail (image == NULL || GTK_IS_WIDGET (image)); + + priv = GTK_BUTTON_GET_PRIVATE (button); priv->image = image; priv->image_is_stock = (image == NULL); |