aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-26 01:10:14 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:04 +0800
commit48d805df31ec77d001c097b01e1788755e9fd8eb (patch)
tree69525ad81799dc15da93280b9ab91840cdac243f /ui
parent57185da9834daeb3169b6e76bc817cb659648450 (diff)
downloadgsoc2013-evolution-48d805df31ec77d001c097b01e1788755e9fd8eb.tar.gz
gsoc2013-evolution-48d805df31ec77d001c097b01e1788755e9fd8eb.tar.zst
gsoc2013-evolution-48d805df31ec77d001c097b01e1788755e9fd8eb.zip
Bug #207580 - Allow new mail check on individual accounts
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-calendars.ui7
-rw-r--r--ui/evolution-contacts.ui7
-rw-r--r--ui/evolution-mail.ui4
-rw-r--r--ui/evolution-memos.ui9
-rw-r--r--ui/evolution-tasks.ui9
5 files changed, 2 insertions, 34 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 55f546626d..483446b5e0 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -1,11 +1,6 @@
<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>
@@ -36,8 +31,6 @@
</menubar>
<toolbar name='main-toolbar'>
#if !EXPRESS
- <toolitem action='send-receive'/>
- <separator/>
<toolitem action='calendar-print'/>
<toolitem action='delete-selection'/>
<separator/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 49e34a72d3..763e43c30d 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -1,11 +1,6 @@
<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'/>
@@ -54,8 +49,6 @@
</menubar>
<toolbar name='main-toolbar'>
#if !EXPRESS
- <toolitem action='send-receive'/>
- <separator/>
<toolitem action='address-book-print'/>
#endif
<toolitem action='delete-selection'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index d158cf862b..6a9c9616f7 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -2,7 +2,7 @@
<menubar name='main-menu'>
<menu action='file-menu'>
<placeholder name='mail-send-receiver'>
- <menuitem action='send-receive'/>
+ <menuitem action='mail-send-receive-submenu'/>
</placeholder>
<placeholder name='long-running-actions'>
<menuitem action='mail-global-expunge'/>
@@ -62,7 +62,7 @@
</menubar>
<toolbar name='main-toolbar'>
<placeholder name='toolbar-actions'>
- <toolitem action='send-receive'/>
+ <placeholder name='mail-send-receiver'/>
<separator/>
#if EXPRESS
<toolitem action='new-addressbook-window'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index f2f188a8ca..54d173dbfb 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -1,11 +1,6 @@
<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>
@@ -34,10 +29,6 @@
</menu>
</menubar>
<toolbar name='main-toolbar'>
-#if !EXPRESS
- <toolitem action='send-receive'/>
- <separator/>
-#endif
<toolitem action='cut-clipboard'/>
<toolitem action='copy-clipboard'/>
<toolitem action='paste-clipboard'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 432ebfadaf..62d9f023b7 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -1,11 +1,6 @@
<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>
@@ -44,10 +39,6 @@
</placeholder>
</menubar>
<toolbar name='main-toolbar'>
-#if !EXPRESS
- <toolitem action='send-receive'/>
- <separator/>
-#endif
<toolitem action='cut-clipboard'/>
<toolitem action='copy-clipboard'/>
<toolitem action='paste-clipboard'/>