[gedit/wip/3.14-osx: 15/16] [osx] Use traditional menu when not using app menu

[Jesse van den Kieboom <jessevdk src gnome org>]

commit c1e84f6ca6fe4436721abf0ea27c2a1d9bbf6380
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Thu Aug 21 20:20:05 2014 +0200

    [osx] Use traditional menu when not using app menu

 gedit/gedit-app.c                        |   10 +++++++++-
 gedit/resources/gtk/menus-traditional.ui |    2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index df2b100..59b8c99 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -509,7 +509,15 @@ gedit_app_startup (GApplication *application)
                                         app);
 
        /* menus */
-       app->priv->window_menu = get_menu_model (app, "gear-menu");
+       if (gtk_application_prefers_app_menu (GTK_APPLICATION (app)))
+       {
+               app->priv->window_menu = get_menu_model (app, "gear-menu");
+       }
+       else
+       {
+               app->priv->window_menu = get_menu_model (app, "menubar");
+       }
+
        app->priv->notebook_menu = get_menu_model (app, "notebook-menu");
        app->priv->tab_width_menu = get_menu_model (app, "tab-width-menu");
        app->priv->line_col_menu = get_menu_model (app, "line-col-menu");
diff --git a/gedit/resources/gtk/menus-traditional.ui b/gedit/resources/gtk/menus-traditional.ui
index 154329f..7fd0b07 100644
--- a/gedit/resources/gtk/menus-traditional.ui
+++ b/gedit/resources/gtk/menus-traditional.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <menu id="gear-menu">
+  <menu id="menubar">
     <section>
       <attribute name="id">juntion-section</attribute>
       <attribute name="display-hint">horizontal-buttons</attribute>