diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-07 03:17:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-07 03:17:43 +0000 |
| commit | 70b08f1e644612a81ff2f875502be92b596da8c0 (patch) | |
| tree | ac9f4fd5a86e9b66b7f4248d79f248090a7ae337 /gtk/gtkimagemenuitem.c | |
| parent | 302cc82c71a1f5d17f9149cff3b90cf6113ac03c (diff) | |
| download | gtk+-70b08f1e644612a81ff2f875502be92b596da8c0.tar.gz | |
Make the new GtkAction code work with PolicyKit-gnome's use of actions.
* gtk/gtkaction.c (gtk_action_[un]block_activate_from): Block
the action.
* gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activatable_reset):
* gtk/gtktogglebutton. (gtk_toggle_button_activatable_reset):
* gtk/gtktoggletoolbutton.c (gtk_toggle_tool_button_activatable_reset):
Work with non-toggle actions without complaining.
* gtk/gtktoolbutton.c (gtk_tool_button_activatable_update): Updating
the icon-name should not remove the label.
* gtk/gtkimagemenuitem.c (activatable_update_icon_name): Also
update the image when the icon name is set to NULL.
svn path=/trunk/; revision=22290
Diffstat (limited to 'gtk/gtkimagemenuitem.c')
| -rw-r--r-- | gtk/gtkimagemenuitem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index a7bc429987..04cc352ff8 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -601,7 +601,7 @@ activatable_update_icon_name (GtkImageMenuItem *image_menu_item, GtkAction *acti image = gtk_image_menu_item_get_image (image_menu_item); - if (GTK_IS_IMAGE (image) && icon_name && + if (GTK_IS_IMAGE (image) && (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY || gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME)) { |