From e39e0ba2480be2393c2170963361b814f0a1495c Mon Sep 17 00:00:00 2001
From: Hao H Li <hao.h.li@intel.com>
Date: Mon, 13 Sep 2010 11:14:36 +0530
Subject: Bug #629037 - Email operations existed in Contacts

Email operations existed in Contacts in Express mode.
---
 ui/evolution-calendars.ui | 5 +++++
 ui/evolution-contacts.ui  | 5 +++++
 ui/evolution-mail.ui      | 3 +++
 ui/evolution-memos.ui     | 5 +++++
 ui/evolution-shell.ui     | 2 +-
 ui/evolution-tasks.ui     | 5 +++++
 6 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 8bd41d4bb1..55f546626d 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -1,6 +1,11 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
+      <placeholder name='mail-send-receiver'>
+#if !EXPRESS
+        <menuitem action='send-receive'/>
+#endif
+      </placeholder>
       <placeholder name='file-actions'>
         <menuitem action='event-open'/>
       </placeholder>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index a258060184..49e34a72d3 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -1,6 +1,11 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
+      <placeholder name='mail-send-receiver'>
+#if !EXPRESS
+        <menuitem action='send-receive'/>
+#endif
+      </placeholder>
       <placeholder name='file-actions'>
         <menuitem action='contact-open'/>
         <menuitem action='contact-save-as'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 7c4db78b85..52a887c2fd 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -1,6 +1,9 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
+      <placeholder name='mail-send-receiver'>
+        <menuitem action='send-receive'/>
+      </placeholder>
       <placeholder name='long-running-actions'>
         <menuitem action='mail-global-expunge'/>
         <menuitem action='mail-download'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index b204605ab9..f2f188a8ca 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -1,6 +1,11 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
+      <placeholder name='mail-send-receiver'>
+#if !EXPRESS
+        <menuitem action='send-receive'/>
+#endif
+      </placeholder>
       <placeholder name='file-actions'>
         <menuitem action='memo-open'/>
       </placeholder>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 97e2f22c4a..f53b2b8fef 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -6,7 +6,7 @@
       <menuitem action='new-window'/>
 #endif
       <separator/>
-      <menuitem action='send-receive'/>
+      <placeholder name='mail-send-receiver'/>
       <placeholder name='file-actions'/>
       <separator/>
       <menuitem action='import'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 8993e5c43a..432ebfadaf 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -1,6 +1,11 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
+      <placeholder name='mail-send-receiver'>
+#if !EXPRESS
+        <menuitem action='send-receive'/>
+#endif
+      </placeholder>
       <placeholder name='file-actions'>
         <menuitem action='task-open'/>
       </placeholder>
-- 
cgit