From e0610b2e0cea191f631dc825cdc8023cdcd9433d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sun, 11 Jan 2009 14:20:50 +0000
Subject: Continue chipping away at EMFolderView and EMFolderBrowser. Migrate
 from gnome_url_show() to e_show_uri().

svn path=/branches/kill-bonobo/; revision=37038
---
 ui/evolution-mail-reader.ui | 31 +++++++++++++++++++++++++++++++
 ui/evolution-mail.ui        | 28 ----------------------------
 2 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index e5ef5db624..a14db5090d 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -123,4 +123,35 @@
       <toolitem action='mail-next'/>
     </placeholder>
   </toolbar>
+  <popup name='mail-message-popup'>
+    <menuitem action='mail-reply-sender'/>
+    <menuitem action='mail-reply-all'/>
+    <menuitem action='mail-forward'/>
+    <separator/>
+    <menuitem action='mail-message-edit'/>
+    <menuitem action='mail-save-as'/>
+    <menuitem action='mail-print'/>
+    <separator/>
+    <menuitem action='mail-delete'/>
+    <menuitem action='mail-copy'/>
+    <menuitem action='mail-move'/>
+    <separator/>
+    <menuitem action='mail-popup-mark-read'/>
+    <menuitem action='mail-popup-mark-unread'/>
+    <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-flag-for-followup'/>
+    <menu action='mail-label-menu'/>
+  </popup>
+  <popup name='mail-uri-popup'>
+    <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'>
+      <menuitem action='mail-uri-to-search-folder-sender'/>
+      <menuitem action='mail-uri-to-search-folder-recipient'/>
+    </menu>
+  </popup>
 </ui>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 665d8900ad..76e93a43b4 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -80,34 +80,6 @@
     <separator/>
     <menuitem action='mail-folder-properties'/>
   </popup>
-  <popup name='mail-message-popup'>
-    <menuitem action='mail-reply-sender'/>
-    <menuitem action='mail-reply-all'/>
-    <menuitem action='mail-forward'/>
-    <separator/>
-    <menuitem action='mail-message-edit'/>
-    <menuitem action='mail-save-as'/>
-    <menuitem action='mail-print'/>
-    <separator/>
-    <menuitem action='mail-delete'/>
-    <menuitem action='mail-copy'/>
-    <menuitem action='mail-move'/>
-    <separator/>
-    <menuitem action='mail-mark-unread'/>
-    <menuitem action='mail-mark-important'/>
-    <menuitem action='mail-mark-junk'/>
-    <menuitem action='mail-flag-for-followup'/>
-    <menu action='mail-label-menu'/>
-  </popup>
-  <popup name='mail-uri-popup'>
-    <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'>
-      <menuitem action='mail-uri-to-search-folder-sender'/>
-      <menuitem action='mail-uri-to-search-folder-recipient'/>
-    </menu>
-  </popup>
   <popup name='mail-search-options'>
     <menuitem action='mail-search-subject-or-sender-contains'/>
     <menuitem action='mail-search-subject-or-recipients-contains'/>
-- 
cgit