aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-03-03 22:05:45 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-03-14 09:53:17 +0800
commitb2ec3b9e8e21bbc3fefa319c7531697711afecfd (patch)
tree04d7fc5c5107d402ccb3aa38115e7feffd59bc72
parent97f274dffdca39bca33296a9f39411dd2680b4ec (diff)
downloadgsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar.gz
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar.bz2
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar.lz
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar.xz
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.tar.zst
gsoc2013-evolution-b2ec3b9e8e21bbc3fefa319c7531697711afecfd.zip
disable cancel button
-rw-r--r--ui/evolution-mail.ui6
-rw-r--r--ui/evolution-shell.ui3
2 files changed, 6 insertions, 3 deletions
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index cf012efcf7..bc37c9b3e0 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -62,9 +62,15 @@
</menubar>
<toolbar name='main-toolbar'>
<placeholder name='mail-toolbar-common'/>
+<!-- if !EXPRESS -->
<toolitem action='mail-stop'/>
+<!-- endif -->
<separator/>
<placeholder name='mail-toolbar-navigation'/>
+<!-- if EXPRESS -->
+ <separator/>
+ <toolitem action='preferences'/>
+<!-- endif -->
</toolbar>
<popup name='mail-folder-popup'>
<placeholder name='mail-folder-popup-actions'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 4fe9de2bc9..dfa6e761f0 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -92,8 +92,5 @@
<toolitem action='send-receive'/>
<separator/>
<placeholder name='toolbar-actions'/>
-<!-- if EXPRESS -->
- <toolitem action='preferences'/>
-<!-- endif -->
</toolbar>
</ui>