From e7a31c5035a0afeed6c1675e30487c1e2bdc139f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 24 Oct 2008 23:02:33 +0000
Subject: Commit recent work so I can merge from trunk.

svn path=/branches/kill-bonobo/; revision=36684
---
 ui/evolution-mail.ui | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 16d4d9e67e..39c9a50fa5 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -160,13 +160,16 @@
     <toolitem action='mail-next'/>
   </toolbar>
   <popup name='mail-folder-popup'>
+    <menuitem action='mail-folder-new'/>
     <menuitem action='mail-folder-copy'/>
     <menuitem action='mail-folder-move'/>
     <separator/>
-    <menuitem action='mail-folder-new'/>
     <menuitem action='mail-folder-delete'/>
+    <separator/>
     <menuitem action='mail-folder-rename'/>
     <menuitem action='mail-folder-refresh'/>
+    <menuitem action='mail-flush-outbox'/>
+    <menuitem action='mail-empty-trash'/>
     <separator/>
     <menuitem action='mail-folder-properties'/>
   </popup>
@@ -193,7 +196,7 @@
     <menuitem action='mail-uri-call-to'/>
     <menuitem action='mail-uri-copy'/>
     <menuitem action='mail-uri-copy-address'/>
-    <menu action='mail-uri-to-search-folder-menu'/>
+    <menu action='mail-uri-to-search-folder-menu'>
       <menuitem action='mail-uri-to-search-folder-sender'/>
       <menuitem action='mail-uri-to-search-folder-recipient'/>
     </menu>
-- 
cgit v1.2.3