[balsa/gtk3] Remove accelerators from app-menu

[Peter Bloomfield <PeterB src gnome org>]

commit 88f9b5e05b52fcb796cfbff54404274b82fe7a6e
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jan 25 14:15:48 2014 -0500

    Remove accelerators from app-menu
    
        * src/main-window.c (bw_set_menus): duplicate "new message",
        "address book", and "quit" on main-window's "file" menu, with
        accelerators;
        * ui/main-window.ui: remove accelerators from app-menu.

 ChangeLog         |   10 ++++++++++
 src/main-window.c |    3 +++
 ui/main-window.ui |   29 ++++++++++++++++++++++++-----
 3 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8abc642..d0d439a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-25  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Remove accelerators from app-menu; duplicate "new message",
+       "address book", and "quit" on main-window's "file" menu.
+
+       * src/main-window.c (bw_set_menus): duplicate "new message",
+       "address book", and "quit" on main-window's "file" menu, with
+       accelerators;
+       * ui/main-window.ui: remove accelerators from app-menu.
+
 2013-12-16  Albrecht Dreß
 
        * libbalsa/rfc3156.c (libbalsa_body_decrypt): tree view icons
diff --git a/src/main-window.c b/src/main-window.c
index 8d99355..3c66c42 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -1939,12 +1939,15 @@ bw_set_menus(BalsaWindow * window)
         {"quit",                  quit_activated}
     };
     static GActionEntry win_entries[] = {
+        {"new-message",           new_message_activated},
         {"continue",              continue_activated},
         {"get-new-mail",          get_new_mail_activated},
         {"send-queued-mail",      send_queued_mail_activated},
         {"send-and-receive-mail", send_and_receive_mail_activated},
         {"page-setup",            page_setup_activated},
         {"print",                 print_activated},
+        {"address-book",          address_book_activated},
+        {"quit",                  quit_activated},
         {"copy",                  copy_activated},
         {"select-all",            select_all_activated},
         {"select-thread",         select_thread_activated},
diff --git a/ui/main-window.ui b/ui/main-window.ui
index bf5c0f8..35553b5 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -6,7 +6,6 @@
         <item>
           <attribute name='label' translatable='yes'>_Message</attribute>
           <attribute name='action'>app.new-message</attribute>
-          <attribute name='accel'>m</attribute>
         </item>
       </section>
       <section>
@@ -64,7 +63,6 @@
         <attribute name='label'
           translatable='yes'>_Address Book</attribute>
         <attribute name='action'>app.address-book</attribute>
-        <attribute name='accel'>b</attribute>
       </item>
     </section>
     <section>
@@ -72,6 +70,8 @@
         <attribute name='label' translatable='yes'>_Preferences</attribute>
         <attribute name='action'>app.prefs</attribute>
       </item>
+    </section>
+    <section>
       <item>
         <attribute name='label' translatable='yes'>_Help</attribute>
         <attribute name='action'>app.help</attribute>
@@ -80,12 +80,9 @@
         <attribute name='label' translatable='yes'>_About</attribute>
         <attribute name='action'>app.about</attribute>
       </item>
-    </section>
-    <section>
       <item>
         <attribute name='label' translatable='yes'>_Quit</attribute>
         <attribute name='action'>app.quit</attribute>
-        <attribute name='accel'>&lt;Primary&gt;q</attribute>
       </item>
     </section>
   </menu>
@@ -94,6 +91,13 @@
       <attribute name='label' translatable='yes'>_File</attribute>
       <section>
         <item>
+          <attribute name='label' translatable='yes'>New _Message</attribute>
+          <attribute name='action'>win.new-message</attribute>
+          <attribute name='accel'>m</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
           <attribute name='label'
             translatable='yes'>_Continue</attribute>
           <attribute name='action'>win.continue</attribute>
@@ -133,6 +137,21 @@
           <attribute name='accel'>&lt;Primary&gt;p</attribute>
         </item>
       </section>
+      <section>
+        <item>
+          <attribute name='label'
+            translatable='yes'>_Address Book</attribute>
+          <attribute name='action'>win.address-book</attribute>
+          <attribute name='accel'>b</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Quit</attribute>
+          <attribute name='action'>win.quit</attribute>
+          <attribute name='accel'>&lt;Primary&gt;q</attribute>
+        </item>
+      </section>
     </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>_Edit</attribute>