[ekiga/ds-gtk-application] Main Window: Simplified menu.

[Damien Sandras <dsandras src gnome org>]

commit daf47f01626557319dee60210aecb9afc224e84b
Author: Damien Sandras <dsandras beip be>
Date:   Sun Feb 16 13:33:52 2014 +0100

    Main Window: Simplified menu.
    
    - Removed View submenu. It was useless as all actions are already
      reachable using toolbar buttons.
    - Use a flat structure. It looks better with the new gear menu.

 lib/engine/gui/gtk-frontend/main_window.cpp |   75 +++++++--------------------
 1 files changed, 19 insertions(+), 56 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index 4251da7..feed254 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -902,59 +902,24 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
     "<?xml version='1.0'?>"
     "<interface>"
     "  <menu id='menubar'>"
-    "    <submenu>"
-    "      <attribute name='label' translatable='yes'>Co_ntact</attribute>"
-    "      <section id='action'>"
-    "      </section>"
-    "      <section>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>_Add Contact</attribute>"
-    "          <attribute name='action'>win.add</attribute>"
-    "        </item>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>Place _Call</attribute>"
-    "          <attribute name='action'>win.call</attribute>"
-    "        </item>"
-    "      </section>"
-    "      <section>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>_Close</attribute>"
-    "          <attribute name='action'>win.close</attribute>"
-    "        </item>"
-    "      </section>"
-    "    </submenu>"
-    "    <submenu>"
-    "      <attribute name='label' translatable='yes'>_View</attribute>"
-    "      <section>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>_Video Preview</attribute>"
-    "          <attribute name='action'>win.enable-preview</attribute>"
-    "        </item>"
-    "      </section>"
-    "      <section>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>Con_tacts</attribute>"
-    "          <attribute name='action'>win.panel-section</attribute>"
-    "          <attribute name='target'>contacts</attribute>"
-    "        </item>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>_Dialpad</attribute>"
-    "          <attribute name='action'>win.panel-section</attribute>"
-    "          <attribute name='target'>dialpad</attribute>"
-    "        </item>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>Call _History</attribute>"
-    "          <attribute name='action'>win.panel-section</attribute>"
-    "          <attribute name='target'>call-history</attribute>"
-    "        </item>"
-    "      </section>"
-    "      <section>"
-    "        <item>"
-    "          <attribute name='label' translatable='yes'>Show _Offline Contacts</attribute>"
-    "          <attribute name='action'>win.show-offline-contacts</attribute>"
-    "        </item>"
-    "      </section>"
-    "    </submenu>"
+    "    <section id='action'>"
+    "    </section>"
+    "    <section>"
+    "      <item>"
+    "        <attribute name='label' translatable='yes'>_Add Contact</attribute>"
+    "        <attribute name='action'>win.add</attribute>"
+    "      </item>"
+    "      <item>"
+    "        <attribute name='label' translatable='yes'>Place _Call</attribute>"
+    "        <attribute name='action'>win.call</attribute>"
+    "      </item>"
+    "    </section>"
+    "    <section>"
+    "      <item>"
+    "        <attribute name='label' translatable='yes'>_Close</attribute>"
+    "        <attribute name='action'>win.close</attribute>"
+    "      </item>"
+    "    </section>"
     "  </menu>"
     "</interface>";
 
@@ -967,9 +932,7 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
   g_action_map_add_action (G_ACTION_MAP (mw),
                            g_settings_create_action (mw->priv->user_interface_settings->get_g_settings (),
                                                      "panel-section"));
-  g_action_map_add_action (G_ACTION_MAP (mw),
-                           g_settings_create_action (mw->priv->contacts_settings->get_g_settings (),
-                                                     "show-offline-contacts"));
+
   g_action_map_add_action_entries (G_ACTION_MAP (mw),
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    mw);