From 1460590b4a586187109d28840af217d1c86248ae Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 23 Jan 2010 10:58:01 -0500
Subject: Rearrange composer options.

Renamed the "Security" menu to "Options" moved other options there:

  Request Read Receipt
  Prioritize Message
  Character Encoding
---
 composer/evolution-composer.ui | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'composer/evolution-composer.ui')

diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index f0e9c01de9..3b1fee7a72 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -20,12 +20,6 @@
         <menuitem action='close'/>
       </menu>
     </placeholder>
-    <menu action='edit-menu'>
-      <placeholder name='pre-spell-check'>
-        <menu action='charset-menu'/>
-        <separator/>
-      </placeholder>
-    </menu>
     <placeholder name='pre-insert-menu'>
       <menu action='view-menu'>
         <menuitem action='view-from'/>
@@ -42,15 +36,17 @@
         <placeholder name='send-options'/>
         <separator/>
       </placeholder>
-      <separator/>
-      <menuitem action='request-read-receipt'/>
-      <menuitem action='prioritize-message'/>
     </menu>
-    <menu action='security-menu'>
+    <menu action='options-menu'>
       <menuitem action='pgp-sign'/>
       <menuitem action='pgp-encrypt'/>
       <menuitem action='smime-sign'/>
       <menuitem action='smime-encrypt'/>
+      <separator/>
+      <menuitem action='request-read-receipt'/>
+      <menuitem action='prioritize-message'/>
+      <separator/>
+      <menu action='charset-menu'/>
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-- 
cgit