diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-02-17 21:38:02 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-02-17 21:38:02 +0800 |
commit | 933ba0f066f65a7c8a91205540e41c46b0a7a45e (patch) | |
tree | e076b9527d1458d7ebb7898a1100301f2dff60d2 /composer | |
parent | 1101e9345997efc4cf97b99d15029d1ceb80c8e9 (diff) | |
download | gsoc2013-evolution-933ba0f066f65a7c8a91205540e41c46b0a7a45e.tar.gz 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 'composer')
-rw-r--r-- | composer/e-composer-private.c | 34 | ||||
-rw-r--r-- | composer/evolution-composer.ui | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index b35c84d4c8..3441c6b566 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -58,38 +58,6 @@ composer_setup_charset_menu (EMsgComposer *composer) } static void -composer_setup_recent_menu (EMsgComposer *composer) -{ - EAttachmentView *view; - GtkUIManager *ui_manager; - GtkAction *action; - const gchar *action_name; - const gchar *path; - guint merge_id; - - view = e_msg_composer_get_attachment_view (composer); - ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); - path = "/main-menu/insert-menu/insert-menu-top/recent-placeholder"; - merge_id = gtk_ui_manager_new_merge_id (ui_manager); - action_name = "recent-menu"; - - action = e_attachment_view_recent_action_new ( - view, action_name, _("Recent _Documents")); - - if (action != NULL) { - gtk_action_group_add_action ( - composer->priv->composer_actions, 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 msg_composer_url_requested_cb (GtkHTML *html, const gchar *uri, GtkHTMLStream *stream, @@ -434,8 +402,6 @@ e_composer_private_constructed (EMsgComposer *composer) /* XXX What is this for? */ g_object_set_data (G_OBJECT (composer), "vbox", editor->vbox); - composer_setup_recent_menu (composer); - /* Bind headers to their corresponding actions. */ for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui index 91fce38a2b..a12865ef8a 100644 --- a/composer/evolution-composer.ui +++ b/composer/evolution-composer.ui @@ -36,7 +36,6 @@ <menu action='insert-menu'> <placeholder name='insert-menu-top'> <menuitem action='attach'/> - <placeholder name='recent-placeholder'/> <separator/> <placeholder name='send-options'/> <separator/> |