aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-27 01:09:33 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-27 01:09:33 +0800
commitc9ec8c3f4dce2b02c91268529977770364ef87fe (patch)
treed574f2be1b5438407e59e2fead1321766c9bbc83 /ui
parent6fec6bf39467dd32625847be1b021a7e5bc94d76 (diff)
parent96538878911586a9e9ca26b81e1916c04e538980 (diff)
downloadgsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.gz
gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.zst
gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.zip
Merge branch 'express2'
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-calendars.ui7
-rw-r--r--ui/evolution-mail-reader.ui4
-rw-r--r--ui/evolution-mail.ui2
-rw-r--r--ui/evolution-shell.ui1
4 files changed, 10 insertions, 4 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f38fa2e7d3..8bd41d4bb1 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -56,10 +56,15 @@
<toolitem action='calendar-view-list'/>
#endif
#if EXPRESS
+ <separator/>
+ <toolitem action='preferences'/>
+#endif
+ </toolbar>
+ <toolbar name='close-toolbar'>
+#if EXPRESS
<separator expand="true"/>
<toolitem action='quit-calendar'/>
#endif
-
</toolbar>
<popup name='calendar-popup'>
<menuitem action='calendar-new'/>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ad0b401676..53cb8845d3 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -82,7 +82,7 @@
<menuitem action="mail-mark-unimportant"/>
<separator/>
<menuitem action="mail-mark-junk"/>
- <menuitem action="mail-mark-notjunk"/>
+ <menuitem action="mail-mark-not-junk"/>
<separator/>
<menuitem action="mail-flag-for-followup"/>
<menuitem action="mail-flag-clear"/>
@@ -127,7 +127,7 @@
#endif
<toolitem action='mail-delete'/>
<toolitem action='mail-mark-junk'/>
- <toolitem action='mail-mark-notjunk'/>
+ <toolitem action='mail-mark-not-junk'/>
</placeholder>
<separator/>
<placeholder name='mail-toolbar-navigation'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 7c4db78b85..cc1b9b5fd8 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -108,7 +108,7 @@
<menuitem action='mail-popup-mark-important'/>
<menuitem action='mail-popup-mark-unimportant'/>
<menuitem action='mail-popup-mark-junk'/>
- <menuitem action='mail-popup-mark-notjunk'/>
+ <menuitem action='mail-popup-mark-not-junk'/>
<menuitem action='mail-popup-flag-for-followup'/>
<menuitem action="mail-popup-flag-clear"/>
<menuitem action="mail-popup-flag-completed"/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 5e249daa2e..c051668290 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -94,4 +94,5 @@
<placeholder name='toolbar-actions'/>
</toolbar>
<toolbar name='search-toolbar'/>
+ <toolbar name='close-toolbar'/>
</ui>