aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2007-05-03 19:15:14 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2007-05-03 19:15:14 +0800
commitecf27970bf8c54ebf10ae9a860c06a90532582a3 (patch)
tree8fea0a0d784d1e194b217f9205fe8b702912b192
parent257cf1da83d92281b1ad287edd016e89e8e4c034 (diff)
downloadgsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar.gz
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar.bz2
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar.lz
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar.xz
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.tar.zst
gsoc2013-evolution-ecf27970bf8c54ebf10ae9a860c06a90532582a3.zip
Do not restrict "Edit as New Message" to Sent Folder alone. Fixes #205728
2007-05-03 Sankar P <psankar@novell.com> * em-folder-view.c: (emfv_activate): Do not restrict "Edit as New Message" to Sent Folder alone. Fixes #205728 svn path=/trunk/; revision=33476
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-view.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9123609abc..386a0bd307 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-03 Sankar P <psankar@novell.com>
+
+ * em-folder-view.c: (emfv_activate):
+ Do not restrict "Edit as New Message" to
+ Sent Folder alone.
+ Fixes #205728
+
2007-05-03 Srinivasa Ragavan <sragavan@novell.com>
** Added code to improve the new mail hook to provide the number of
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 62568c8282..30a736d49b 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1140,7 +1140,8 @@ static EPopupItem emfv_popup_items[] = {
{ E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY },
{ E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL },
- { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_EDIT },
+ /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */
+ { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE },
{ E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "stock_save-as", EM_POPUP_SELECT_MANY },
{ E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "stock_print", EM_POPUP_SELECT_ONE },
@@ -1893,7 +1894,7 @@ static const EMFolderViewEnable emfv_enable_map[] = {
{ "MessageReplyAll", EM_POPUP_SELECT_ONE },
{ "MessageReplyList", EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST },
{ "MessageReplySender", EM_POPUP_SELECT_ONE },
- { "MessageEdit", EM_POPUP_SELECT_EDIT },
+ { "MessageEdit", EM_POPUP_SELECT_ONE },
{ "MessageSaveAs", EM_POPUP_SELECT_MANY },
{ "MessageSearch", EM_POPUP_SELECT_ONE| EM_FOLDER_VIEW_PREVIEW_PRESENT },
{ "MessageUndelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_UNDELETE },
@@ -2073,7 +2074,7 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
/* bonobo_ui_component_add_listener(uic, "ViewSource", emfv_view_mode, emfv); */
em_format_set_mode((EMFormat *)emfv->preview, style);
- if (emfv->folder && !em_utils_folder_is_sent(emfv->folder, emfv->folder_uri))
+ if (emfv->folder)
bonobo_ui_component_set_prop(uic, "/commands/MessageEdit", "sensitive", "0", NULL);
/* default charset used in mail view */