[evolution] disable cancel button

[Matthew Barnes <mbarnes src gnome org>]

commit b2ec3b9e8e21bbc3fefa319c7531697711afecfd
Author: Michael Meeks <michael meeks novell com>
Date:   Wed Mar 3 14:05:45 2010 +0000

    disable cancel button

 ui/evolution-mail.ui  |    6 ++++++
 ui/evolution-shell.ui |    3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index cf012ef..bc37c9b 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 4fe9de2..dfa6e76 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>