diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-content.c | 13 | ||||
| -rw-r--r-- | shell/e-shell-content.h | 3 | ||||
| -rw-r--r-- | shell/e-shell-window-actions.c | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index efa3b663f0..f3685793b7 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -1013,6 +1013,19 @@ e_shell_content_set_filter_visible (EShellContent *shell_content, } } +void +e_shell_content_add_filter_separator_after (EShellContent *shell_content, + gint action_value) +{ + EActionComboBox *combo_box; + + g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); + + combo_box = E_ACTION_COMBO_BOX (shell_content->priv->filter_combo_box); + + e_action_combo_box_add_separator_after (combo_box, action_value); +} + RuleContext * e_shell_content_get_search_context (EShellContent *shell_content) { diff --git a/shell/e-shell-content.h b/shell/e-shell-content.h index defeb0a403..ae9d0446ab 100644 --- a/shell/e-shell-content.h +++ b/shell/e-shell-content.h @@ -82,6 +82,9 @@ gboolean e_shell_content_get_filter_visible void e_shell_content_set_filter_visible (EShellContent *shell_content, gboolean filter_visible); +void e_shell_content_add_filter_separator_after + (EShellContent *shell_content, + gint action_value); RuleContext * e_shell_content_get_search_context (EShellContent *shell_content); FilterRule * e_shell_content_get_search_rule (EShellContent *shell_content); diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 28920a7eb7..ab403c31dc 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1727,7 +1727,6 @@ e_shell_window_create_switcher_actions (EShellWindow *shell_window) gtk_action_group_add_action_with_accel ( action_group, GTK_ACTION (action), accelerator); - g_debug ("Adding action '%s'", action_name); e_shell_switcher_add_action (switcher, GTK_ACTION (action)); gtk_ui_manager_add_ui ( @@ -1767,7 +1766,6 @@ e_shell_window_update_view_menu (EShellWindow *shell_window) GalViewCollection *view_collection; GtkRadioAction *radio_action; GtkAction *action; - GList *list, *iter; GSList *radio_group; gboolean visible; const gchar *path; @@ -1789,13 +1787,7 @@ e_shell_window_update_view_menu (EShellWindow *shell_window) /* Unmerge the previous menu. */ gtk_ui_manager_remove_ui (ui_manager, merge_id); - - /* XXX Annoying that GTK+ doesn't provide a function for this. - * http://bugzilla.gnome.org/show_bug.cgi?id=550485 */ - list = gtk_action_group_list_actions (action_group); - for (iter = list; iter != NULL; iter = iter->next) - gtk_action_group_remove_action (action_group, iter->data); - g_list_free (list); + e_action_group_remove_all_actions (action_group); /* We have a view ID, so forge ahead. */ count = gal_view_collection_get_count (view_collection); |