From 933ba0f066f65a7c8a91205540e41c46b0a7a45e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Feb 2012 08:38:02 -0500 Subject: Bug 670280 - Remove "Recent Documents" attachment feature GTK's file chooser dialog provides one-click access to recently used documents now, so we can remove the redundancy from Evolution's mail composer main menu and calendar component editor main menu and leave it at "Insert -> Attachment". --- calendar/gui/dialogs/comp-editor.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 12ecb02d16..e3676e60c2 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -173,7 +173,6 @@ static const gchar *ui = " " " " " " -" " " " " " " " @@ -1325,40 +1324,6 @@ static GtkToggleActionEntry coordinated_toggle_entries[] = { FALSE } }; -static void -comp_editor_setup_recent_menu (CompEditor *editor) -{ - EAttachmentView *view; - GtkUIManager *ui_manager; - GtkAction *action; - GtkActionGroup *action_group; - const gchar *action_name; - const gchar *path; - guint merge_id; - - ui_manager = editor->priv->ui_manager; - view = E_ATTACHMENT_VIEW (editor->priv->attachment_view); - action_group = comp_editor_get_action_group (editor, "individual"); - merge_id = gtk_ui_manager_new_merge_id (ui_manager); - path = "/main-menu/insert-menu/recent-placeholder"; - action_name = "recent-menu"; - - action = e_attachment_view_recent_action_new ( - view, action_name, _("Recent _Documents")); - - if (action != NULL) { - gtk_action_group_add_action (action_group, action); - g_object_unref (action); - - gtk_ui_manager_add_ui ( - ui_manager, merge_id, path, - action_name, action_name, - GTK_UI_MANAGER_AUTO, FALSE); - } - - gtk_ui_manager_ensure_update (ui_manager); -} - static void comp_editor_set_shell (CompEditor *editor, EShell *shell) @@ -2152,8 +2117,6 @@ comp_editor_init (CompEditor *editor) priv->notebook = GTK_NOTEBOOK (widget); gtk_widget_show (widget); - comp_editor_setup_recent_menu (editor); - /* Drag-and-Drop Support */ view = E_ATTACHMENT_VIEW (priv->attachment_view); -- cgit