Merge lp:~robert-ancell/unity-control-center/always-menubar into lp:unity-control-center

[Robert Ancell]

Always use a menubar.

[Sebastien Bacher (seb128)]

That makes sense

review: Approve

=== modified file 'shell/control-center.c'
--- shell/control-center.c	2014-04-10 11:08:20 +0000
+++ shell/control-center.c	2016-03-09 22:33:09 +0000
@@ -266,38 +266,22 @@
   g_action_map_add_action (G_ACTION_MAP (application), action);
   g_signal_connect (action, "activate", G_CALLBACK (quit_activated), shell);
 
-  if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
-  {
-    menubar = g_menu_new ();
-    menu = g_menu_new ();
-
-    section = g_menu_new ();
-    g_menu_append (section, _("Contents"), "app.contents");
-    g_menu_append_section (menu, NULL, G_MENU_MODEL (section));
-
-    g_menu_append (menu, _("Quit"), "app.quit");
-
-    g_menu_append_submenu (menubar, _("Help"), G_MENU_MODEL (menu));
-
-    gtk_application_set_menubar (GTK_APPLICATION (application),
-                                 G_MENU_MODEL (menubar));
-
-    g_signal_connect (shell, "notify::active-panel",
-                      G_CALLBACK (active_panel_changed_cb), section);
-  }
-  else
-  {
-    menu = g_menu_new ();
-
-    section = g_menu_new ();
-    g_menu_append (section, _("Help"), "app.help");
-    g_menu_append (section, _("Quit"), "app.quit");
-
-    g_menu_append_section (menu, NULL, G_MENU_MODEL (section));
-
-    gtk_application_set_app_menu (GTK_APPLICATION (application),
-                                  G_MENU_MODEL (menu));
-  }
+  menubar = g_menu_new ();
+  menu = g_menu_new ();
+
+  section = g_menu_new ();
+  g_menu_append (section, _("Contents"), "app.contents");
+  g_menu_append_section (menu, NULL, G_MENU_MODEL (section));
+
+  g_menu_append (menu, _("Quit"), "app.quit");
+
+  g_menu_append_submenu (menubar, _("Help"), G_MENU_MODEL (menu));
+
+  gtk_application_set_menubar (GTK_APPLICATION (application),
+                               G_MENU_MODEL (menubar));
+
+  g_signal_connect (shell, "notify::active-panel",
+                    G_CALLBACK (active_panel_changed_cb), section);
 
   gtk_application_add_accelerator (GTK_APPLICATION (application),
                                    "F1", "app.help", NULL);