aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHao H Li <hao.h.li@intel.com>2010-09-13 13:44:36 +0800
committerBharath Acharya <abharath@novell.com>2010-09-13 13:44:36 +0800
commite39e0ba2480be2393c2170963361b814f0a1495c (patch)
tree4fa95e4072b5300024bfae2af8e455948d64c5f4
parentd74e3a57ddbcc344bb556fc5342b215b798aaba2 (diff)
downloadgsoc2013-evolution-e39e0ba2480be2393c2170963361b814f0a1495c.tar.gz
gsoc2013-evolution-e39e0ba2480be2393c2170963361b814f0a1495c.tar.zst
gsoc2013-evolution-e39e0ba2480be2393c2170963361b814f0a1495c.zip
Bug #629037 - Email operations existed in Contacts
Email operations existed in Contacts in Express mode.
-rw-r--r--ui/evolution-calendars.ui5
-rw-r--r--ui/evolution-contacts.ui5
-rw-r--r--ui/evolution-mail.ui3
-rw-r--r--ui/evolution-memos.ui5
-rw-r--r--ui/evolution-shell.ui2
-rw-r--r--ui/evolution-tasks.ui5
6 files changed, 24 insertions, 1 deletions
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>