aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-02-17 21:38:02 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-02-17 21:38:02 +0800
commit933ba0f066f65a7c8a91205540e41c46b0a7a45e (patch)
treee076b9527d1458d7ebb7898a1100301f2dff60d2 /calendar
parent1101e9345997efc4cf97b99d15029d1ceb80c8e9 (diff)
downloadgsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.gz
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.bz2
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.lz
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.xz
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.zst
gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.zip
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".
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/dialogs/comp-editor.c37
1 files changed, 0 insertions, 37 deletions
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 =
" <menu action='view-menu'/>"
" <menu action='insert-menu'>"
" <menuitem action='attach'/>"
-" <placeholder name='recent-placeholder'/>"
" </menu>"
" <menu action='options-menu'/>"
" <menu action='help-menu'>"
@@ -1326,40 +1325,6 @@ static GtkToggleActionEntry coordinated_toggle_entries[] = {
};
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);