diff options
author | Matthias Clasen <mclasen@redhat.com> | 2011-07-03 15:33:27 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2011-07-05 16:10:26 -0400 |
commit | e1463ab57cd69064f3f822f0d28bcd7b724f4e70 (patch) | |
tree | e0a99d8fb0055a2d20b6430477b6e025eb009077 | |
parent | 5d90ca35c27439700f40dc21d22d2765ba09c03c (diff) | |
download | gtk+-e1463ab57cd69064f3f822f0d28bcd7b724f4e70.tar.gz |
Silence compiler warnings
-rw-r--r-- | gtk/a11y/gtkbuttonaccessible.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c index 5951b90d5b..891cb2d78b 100644 --- a/gtk/a11y/gtkbuttonaccessible.c +++ b/gtk/a11y/gtkbuttonaccessible.c @@ -276,7 +276,6 @@ static const gchar * gtk_button_accessible_get_keybinding (AtkAction *action, gint i) { - GtkButtonAccessible *button; gchar *return_value = NULL; GtkWidget *widget; GtkWidget *label; @@ -289,8 +288,6 @@ gtk_button_accessible_get_keybinding (AtkAction *action, if (i != 0) return NULL; - button = GTK_BUTTON_ACCESSIBLE (action); - label = get_label_from_button (widget); if (GTK_IS_LABEL (label)) { @@ -376,7 +373,7 @@ gtk_button_accessible_get_image_position (AtkImage *image, AtkCoordType coord_type) { GtkWidget *widget; - GtkImage *button_image; + GtkWidget *button_image; AtkObject *obj; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); @@ -388,10 +385,9 @@ gtk_button_accessible_get_image_position (AtkImage *image, } button_image = get_image_from_button (widget); - if (button_image != NULL) { - obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); + obj = gtk_widget_get_accessible (button_image); atk_component_get_position (ATK_COMPONENT (obj), x, y, coord_type); } else @@ -407,7 +403,7 @@ gtk_button_accessible_get_image_size (AtkImage *image, gint *height) { GtkWidget *widget; - GtkImage *button_image; + GtkWidget *button_image; AtkObject *obj; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); @@ -419,8 +415,7 @@ gtk_button_accessible_get_image_size (AtkImage *image, } button_image = get_image_from_button (widget); - - if (button_image != NULL) + if (GTK_IS_IMAGE (button_image)) { obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); atk_image_get_image_size (ATK_IMAGE (obj), width, height); @@ -437,7 +432,7 @@ gtk_button_accessible_set_image_description (AtkImage *image, const gchar *description) { GtkWidget *widget; - GtkImage *button_image; + GtkWidget *button_image; AtkObject *obj; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image)); @@ -446,8 +441,7 @@ gtk_button_accessible_set_image_description (AtkImage *image, return FALSE; button_image = get_image_from_button (widget); - - if (button_image != NULL) + if (GTK_IMAGE (button_image)) { obj = gtk_widget_get_accessible (GTK_WIDGET (button_image)); return atk_image_set_image_description (ATK_IMAGE (obj), description); |