diff options
Diffstat (limited to 'lib/widgets/ephy-editable-toolbar.c')
| -rwxr-xr-x | lib/widgets/ephy-editable-toolbar.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/widgets/ephy-editable-toolbar.c b/lib/widgets/ephy-editable-toolbar.c index 98b9afd47..c8b2d9f9e 100755 --- a/lib/widgets/ephy-editable-toolbar.c +++ b/lib/widgets/ephy-editable-toolbar.c @@ -395,6 +395,8 @@ do_merge (EphyEditableToolbar *t) char *str; guint ui_id; + g_return_if_fail (t != NULL); + str = ephy_toolbars_group_to_string (t->priv->group); LOG ("Merge UI\n%s", str) @@ -436,16 +438,21 @@ do_merge (EphyEditableToolbar *t) } static void -group_changed_cb (EphyToolbarsGroup *group, EphyEditableToolbar *t) +ensure_action (EphyToolbarsItem *item, EphyEditableToolbar *t) { - t->priv->toolbars_dirty = TRUE; - queue_ui_update (t); + ephy_editable_toolbar_get_action (t, NULL, item->action); } static void -ensure_action (EphyToolbarsItem *item, EphyEditableToolbar *t) +group_changed_cb (EphyToolbarsGroup *group, EphyEditableToolbar *t) { - ephy_editable_toolbar_get_action (t, NULL, item->action); + t->priv->toolbars_dirty = TRUE; + + ephy_toolbars_group_foreach_item (t->priv->group, + (EphyToolbarsGroupForeachItemFunc) + ensure_action, t); + + queue_ui_update (t); } static void |