callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the new GtkAction code work with PolicyKit-gnome's use of actions.

Browse Source 
* 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
This commit is contained in:
Matthias Clasen
2009-02-07 03:17:43 +00:00
parent 302cc82c71
commit 70b08f1e64
7 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtktoggletoolbutton.c
View File

@ -346,7 +346,7 @@ gtk_toggle_tool_button_activatable_reset (GtkActivatable *activatable,
parent_activatable_iface->reset (activatable, action);
if (!action)
if (!GTK_IS_TOGGLE_ACTION (action))
return;
button = GTK_TOGGLE_TOOL_BUTTON (activatable);