Get the Character Encoding menu working.

Kill e_charset_picker_bonobo_ui_populate().

svn path=/branches/kill-bonobo/; revision=36950

2 files changed, 17 insertions, 110 deletions

diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index da6e2872d1..e5ef5db624 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -35,7 +35,10 @@
           <menuitem action='mail-zoom-100'/>
         </menu>
         <separator/>
-        <menu action='mail-encoding-menu'/>
+        <menu action='mail-encoding-menu'>
+          <menuitem action='mail-charset-default'/>
+          <separator/>
+        </menu>
       </placeholder>
     </menu>
     <placeholder name='custom-menus'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index e54b6a93ca..665d8900ad 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -1,29 +1,12 @@
 <ui>
   <menubar name='main-menu'>
     <menu action='file-menu'>
-      <placeholder name='file-actions'>
-        <menuitem action='mail-save-as'/>
-      </placeholder>
-      <placeholder name='print-actions'>
-        <menuitem action='mail-print-preview'/>
-        <menuitem action='mail-print'/>
-      </placeholder>
       <placeholder name='long-running-actions'>
         <menuitem action='mail-empty-trash'/>
         <menuitem action='mail-download'/>
       </placeholder>
     </menu>
     <menu action='edit-menu'>
-      <placeholder name='edit-actions'>
-        <menuitem action='mail-clipboard-copy'/>
-        <separator/>
-        <menuitem action='mail-select-all'/>
-        <separator/>
-        <menuitem action='mail-delete'/>
-        <menuitem action='mail-undelete'/>
-        <separator/>
-        <menuitem action='mail-find'/>
-      </placeholder>
       <placeholder name='administrative-actions'>
         <menuitem action='mail-tools-filters'/>
         <menuitem action='mail-tools-search-folders'/>
@@ -38,26 +21,16 @@
           <menuitem action='mail-view-vertical'/>
         </menu>
       </placeholder>
-      <separator/>
-      <menuitem action='mail-threads-group-by'/>
-      <menuitem action='mail-threads-expand-all'/>
-      <menuitem action='mail-threads-collapse-all'/>
-      <separator/>
-      <menuitem action='mail-hide-deleted'/>
-      <menuitem action='mail-hide-selected'/>
-      <menuitem action='mail-hide-read'/>
-      <menuitem action='mail-show-hidden'/>
-      <separator/>
-      <menuitem action='mail-load-images'/>
-      <menuitem action='mail-show-all-headers'/>
-      <menuitem action='mail-caret-mode'/>
-      <menuitem action='mail-show-source'/>
-      <menu action='mail-zoom-menu'>
-        <menuitem action='mail-zoom-in'/>
-        <menuitem action='mail-zoom-out'/>
-        <menuitem action='mail-zoom-100'/>
-      </menu>
-      <menu action='mail-encoding-menu'/>
+      <placeholder name='mail-message-list-actions'>
+        <menuitem action='mail-threads-group-by'/>
+        <menuitem action='mail-threads-expand-all'/>
+        <menuitem action='mail-threads-collapse-all'/>
+        <separator/>
+        <menuitem action='mail-hide-deleted'/>
+        <menuitem action='mail-hide-selected'/>
+        <menuitem action='mail-hide-read'/>
+        <menuitem action='mail-show-hidden'/>
+      </placeholder>
     </menu>
     <placeholder name='custom-menus'>
       <menu action='mail-folder-menu'>
@@ -79,68 +52,7 @@
         <separator/>
         <menuitem action='mail-folder-properties'/>
       </menu>
-      <menu action='mail-message-menu'>
-        <menuitem action='mail-message-new'/>
-        <menuitem action='mail-message-post'/>
-        <menuitem action='mail-message-open'/>
-        <menuitem action='mail-message-edit'/>
-        <menuitem action='mail-add-sender'/>
-        <separator/>
-        <menu action='mail-goto-menu'>
-          <menuitem action='mail-next'/>
-          <menuitem action='mail-next-unread'/>
-          <menuitem action='mail-next-important'/>
-          <menuitem action='mail-next-thread'/>
-          <separator/>
-          <menuitem action='mail-previous'/>
-          <menuitem action='mail-previous-unread'/>
-          <menuitem action='mail-previous-important'/>
-        </menu>
-        <menuitem action='mail-reply-sender'/>
-        <menuitem action='mail-reply-list'/>
-        <menuitem action='mail-reply-all'/>
-        <menuitem action='mail-reply-post'/>
-        <menuitem action='mail-forward'/>
-        <menu action='mail-forward-as-menu'>
-          <menuitem action='mail-forward-attached'/>
-          <menuitem action='mail-forward-inline'/>
-          <menuitem action='mail-forward-quoted'/>
-          <separator/>
-          <menuitem action='mail-redirect'/>
-        </menu>
-        <separator/>
-        <menuitem action='mail-copy'/>
-        <menuitem action='mail-move'/>
-        <separator/>
-        <menu action='mail-mark-as-menu'>
-          <menuitem action="mail-mark-read"/>
-          <menuitem action="mail-mark-unread"/>
-          <separator/>
-          <menuitem action="mail-mark-important"/>
-          <menuitem action="mail-mark-unimportant"/>
-          <separator/>
-          <menuitem action="mail-mark-junk"/>
-          <menuitem action="mail-mark-notjunk"/>
-          <separator/>
-          <menuitem action="mail-flag-for-followup"/>
-          <menuitem action="mail-flag-clear"/>
-          <menuitem action="mail-flag-completed"/>
-        </menu>
-        <menuitem action='mail-filters-apply'/>
-        <menuitem action='mail-check-for-junk'/>
-        <separator/>
-        <menu action='mail-create-rule-menu'>
-          <menuitem action='mail-filter-on-subject'/>
-          <menuitem action='mail-filter-on-sender'/>
-          <menuitem action='mail-filter-on-recipients'/>
-          <menuitem action='mail-filter-on-mailing-list'/>
-          <separator/>
-          <menuitem action='mail-search-folder-from-subject'/>
-          <menuitem action='mail-search-folder-from-sender'/>
-          <menuitem action='mail-search-folder-from-recipients'/>
-          <menuitem action='mail-search-folder-from-mailing-list'/>
-        </menu>
-      </menu>
+      <menu action='mail-message-menu'/>
     </placeholder>
     <menu action='search-menu'>
       <placeholder name='search-actions'>
@@ -149,18 +61,10 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-    <toolitem action='mail-reply-sender'/>
-    <toolitem action='mail-reply-all'/>
-    <toolitem action='mail-forward'/>
-    <separator/>
-    <toolitem action='mail-print'/>
-    <toolitem action='mail-delete'/>
-    <toolitem action='mail-mark-junk'/>
-    <toolitem action='mail-mark-notjunk'/>
+    <placeholder name='mail-toolbar-common'/>
     <toolitem action='mail-stop'/>
     <separator/>
-    <toolitem action='mail-previous'/>
-    <toolitem action='mail-next'/>
+    <placeholder name='mail-toolbar-navigation'/>
   </toolbar>
   <popup name='mail-folder-popup'>
     <menuitem action='mail-folder-new'/>