From d6ad0c22a24fd871f31db3edff98b83765ce32ad Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 20 Jun 2012 22:04:39 -0400
Subject: Bug 678397 - Move "mail-to-task" actions to a submenu

Shortens the Message menu a little for low screen resolutions.
---
 plugins/mail-to-task/mail-to-task.c                |  8 ++--
 .../mail-to-task/org-gnome-mail-to-task.eplug.xml  | 54 ++++++++++++----------
 2 files changed, 34 insertions(+), 28 deletions(-)

(limited to 'plugins/mail-to-task')

diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 89ba097611..3014388e4c 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -54,8 +54,8 @@
 #include <calendar/gui/dialogs/memo-editor.h>
 #include <calendar/gui/dialogs/task-editor.h>
 
-#define E_SHELL_WINDOW_ACTION_CONVERT_TO_EVENT(window) \
-	E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-event")
+#define E_SHELL_WINDOW_ACTION_CONVERT_TO_APPOINTMENT(window) \
+	E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-appointment")
 #define E_SHELL_WINDOW_ACTION_CONVERT_TO_MEETING(window) \
 	E_SHELL_WINDOW_ACTION ((window), "mail-convert-to-meeting")
 #define E_SHELL_WINDOW_ACTION_CONVERT_TO_MEMO(window) \
@@ -1266,9 +1266,9 @@ action_mail_convert_to_task_cb (GtkAction *action,
 
 static GtkActionEntry multi_selection_entries[] = {
 
-	{ "mail-convert-to-event",
+	{ "mail-convert-to-appointment",
 	  "appointment-new",
-	  N_("Create an _Event"),
+	  N_("Create an _Appointment"),
 	  NULL,
 	  N_("Create a new event from the selected message"),
 	  G_CALLBACK (action_mail_convert_to_event_cb) },
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index d904d295d6..792023fb10 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -8,21 +8,23 @@
       <ui-manager id="org.gnome.evolution.mail.browser"
                   callback="mail_browser_init">
 #if !EXPRESS
-        <menubar name='main-menu'>
-          <placeholder name='custom-menus'>
+        <menubar name="main-menu">
+          <placeholder name="custom-menus">
             <menu action="mail-message-menu">
-              <placeholder name="mail-message-actions">
-                <menuitem action="mail-convert-to-event"/>
-                <menuitem action="mail-convert-to-meeting"/>
-                <menuitem action="mail-convert-to-task"/>
-                <menuitem action="mail-convert-to-memo"/>
-              </placeholder>
+              <menu action="mail-create-menu">
+                <placeholder name="mail-conversion-actions">
+                  <menuitem action="mail-convert-to-appointment"/>
+                  <menuitem action="mail-convert-to-meeting"/>
+                  <menuitem action="mail-convert-to-task"/>
+                  <menuitem action="mail-convert-to-memo"/>
+                </placeholder>
+              </menu>
             </menu>
           </placeholder>
         </menubar>
         <popup name="mail-preview-popup">
           <placeholder name="mail-message-popup-actions">
-            <menuitem action="mail-convert-to-event"/>
+            <menuitem action="mail-convert-to-appointment"/>
             <menuitem action="mail-convert-to-meeting"/>
             <menuitem action="mail-convert-to-task"/>
             <menuitem action="mail-convert-to-memo"/>
@@ -33,29 +35,33 @@
       <ui-manager id="org.gnome.evolution.mail"
                   callback="mail_shell_view_init">
 #if !EXPRESS
-        <menubar name='main-menu'>
-          <placeholder name='custom-menus'>
+        <menubar name="main-menu">
+          <placeholder name="custom-menus">
             <menu action="mail-message-menu">
-              <placeholder name="mail-message-actions">
-                <menuitem action="mail-convert-to-event"/>
-                <menuitem action="mail-convert-to-meeting"/>
-                <menuitem action="mail-convert-to-task"/>
-                <menuitem action="mail-convert-to-memo"/>
-              </placeholder>
+              <menu action="mail-create-menu">
+                <placeholder name="mail-conversion-actions">
+                  <menuitem action="mail-convert-to-appointment"/>
+                  <menuitem action="mail-convert-to-meeting"/>
+                  <menuitem action="mail-convert-to-task"/>
+                  <menuitem action="mail-convert-to-memo"/>
+                </placeholder>
+              </menu>
             </menu>
           </placeholder>
         </menubar>
         <popup name="mail-message-popup">
-           <placeholder name="mail-message-popup-actions">
-            <menuitem action="mail-convert-to-event"/>
-            <menuitem action="mail-convert-to-meeting"/>
-            <menuitem action="mail-convert-to-task"/>
-            <menuitem action="mail-convert-to-memo"/>
-          </placeholder>
+           <menu action="mail-create-menu">
+             <placeholder name="mail-conversion-actions">
+              <menuitem action="mail-convert-to-appointment"/>
+              <menuitem action="mail-convert-to-meeting"/>
+              <menuitem action="mail-convert-to-task"/>
+              <menuitem action="mail-convert-to-memo"/>
+            </placeholder>
+          </menu>
         </popup>
         <popup name="mail-preview-popup">
           <placeholder name="mail-message-popup-actions">
-            <menuitem action="mail-convert-to-event"/>
+            <menuitem action="mail-convert-to-appointment"/>
             <menuitem action="mail-convert-to-meeting"/>
             <menuitem action="mail-convert-to-task"/>
             <menuitem action="mail-convert-to-memo"/>
-- 
cgit v1.2.3