[gedit] gear menu -> hamburger menu

[Paolo Borelli <pborelli src gnome org>]

commit 56af2d168f8bc2383615a66a9b8c5ef2f0e5934e
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Jan 19 21:31:11 2016 +0100

    gear menu -> hamburger menu
    
    It has not been a gear for a long time...

 gedit/gedit-app-private.h    |    2 +-
 gedit/gedit-app.c            |   16 ++++++++--------
 gedit/gedit-window.c         |   20 ++++++++++----------
 gedit/gedit-window.h         |    4 ++--
 gedit/resources/gtk/menus.ui |    2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gedit/gedit-app-private.h b/gedit/gedit-app-private.h
index cc83407..43d457b 100644
--- a/gedit/gedit-app-private.h
+++ b/gedit/gedit-app-private.h
@@ -50,7 +50,7 @@ void                   _gedit_app_set_default_print_settings  (GeditApp         *app,
 
 GeditSettings          *_gedit_app_get_settings                (GeditApp  *app);
 
-GMenuModel             *_gedit_app_get_gear_menu               (GeditApp  *app);
+GMenuModel             *_gedit_app_get_hamburger_menu          (GeditApp  *app);
 
 GMenuModel             *_gedit_app_get_notebook_menu           (GeditApp  *app);
 
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 22de96f..c3a0a47 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -74,7 +74,7 @@ typedef struct
        GSettings         *ui_settings;
        GSettings         *window_settings;
 
-       GMenuModel        *gear_menu;
+       GMenuModel        *hamburger_menu;
        GMenuModel        *notebook_menu;
        GMenuModel        *tab_width_menu;
        GMenuModel        *line_col_menu;
@@ -199,7 +199,7 @@ gedit_app_dispose (GObject *object)
                g_clear_object (&priv->theme_provider);
        }
 
-       g_clear_object (&priv->gear_menu);
+       g_clear_object (&priv->hamburger_menu);
        g_clear_object (&priv->notebook_menu);
        g_clear_object (&priv->tab_width_menu);
        g_clear_object (&priv->line_col_menu);
@@ -797,7 +797,7 @@ gedit_app_startup (GApplication *application)
                                         application);
 
        /* menus */
-       priv->gear_menu = get_menu_model (GEDIT_APP (application), "gear-menu");
+       priv->hamburger_menu = get_menu_model (GEDIT_APP (application), "hamburger-menu");
        priv->notebook_menu = get_menu_model (GEDIT_APP (application), "notebook-menu");
        priv->tab_width_menu = get_menu_model (GEDIT_APP (application), "tab-width-menu");
        priv->line_col_menu = get_menu_model (GEDIT_APP (application), "line-col-menu");
@@ -807,7 +807,7 @@ gedit_app_startup (GApplication *application)
        add_accelerator (GTK_APPLICATION (application), "app.quit", "<Primary>Q");
        add_accelerator (GTK_APPLICATION (application), "app.help", "F1");
 
-       add_accelerator (GTK_APPLICATION (application), "win.gear-menu", "F10");
+       add_accelerator (GTK_APPLICATION (application), "win.hamburger-menu", "F10");
        add_accelerator (GTK_APPLICATION (application), "win.open", "<Primary>O");
        add_accelerator (GTK_APPLICATION (application), "win.save", "<Primary>S");
        add_accelerator (GTK_APPLICATION (application), "win.save-as", "<Primary><Shift>S");
@@ -1871,7 +1871,7 @@ _gedit_app_get_settings (GeditApp *app)
 }
 
 GMenuModel *
-_gedit_app_get_gear_menu (GeditApp *app)
+_gedit_app_get_hamburger_menu (GeditApp *app)
 {
        GeditAppPrivate *priv;
 
@@ -1879,7 +1879,7 @@ _gedit_app_get_gear_menu (GeditApp *app)
 
        priv = gedit_app_get_instance_private (app);
 
-       return priv->gear_menu;
+       return priv->hamburger_menu;
 }
 
 GMenuModel *
@@ -1932,9 +1932,9 @@ _gedit_app_extend_menu (GeditApp    *app,
        priv = gedit_app_get_instance_private (app);
 
        /* First look in the gear or window menu */
-       if (priv->gear_menu)
+       if (priv->hamburger_menu)
        {
-               model = priv->gear_menu;
+               model = priv->hamburger_menu;
        }
        else
        {
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index b1f125e..73dc81f 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -1811,16 +1811,16 @@ static gboolean
 real_fullscreen_controls_leave_notify_event (gpointer data)
 {
        GeditWindow *window = GEDIT_WINDOW (data);
-       gboolean gear_menu_state;
+       gboolean hamburger_menu_state;
        gboolean fullscreen_open_button_state;
 
-       gear_menu_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(window->priv->fullscreen_gear_button));
+       hamburger_menu_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(window->priv->fullscreen_gear_button));
        fullscreen_open_button_state =
                          gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(window->priv->fullscreen_open_button));
 
        window->priv->in_fullscreen_eventbox = FALSE;
 
-       if (!gear_menu_state && !fullscreen_open_button_state)
+       if (!hamburger_menu_state && !fullscreen_open_button_state)
        {
                gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->fullscreen_controls), FALSE);
        }
@@ -2738,8 +2738,8 @@ sync_fullscreen_actions (GeditWindow *window,
        GPropertyAction *action;
 
        button = fullscreen ? window->priv->fullscreen_gear_button : window->priv->gear_button;
-       g_action_map_remove_action (G_ACTION_MAP (window), "gear-menu");
-       action = g_property_action_new ("gear-menu", button, "active");
+       g_action_map_remove_action (G_ACTION_MAP (window), "hamburger-menu");
+       action = g_property_action_new ("hamburger-menu", button, "active");
        g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (action));
        g_object_unref (action);
 }
@@ -2748,7 +2748,7 @@ static void
 gedit_window_init (GeditWindow *window)
 {
        GtkTargetList *tl;
-       GMenuModel *gear_menu;
+       GMenuModel *hamburger_menu;
 
        gedit_debug (DEBUG_WINDOW);
 
@@ -2807,11 +2807,11 @@ gedit_window_init (GeditWindow *window)
                                "text",
                                G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
 
-       gear_menu = _gedit_app_get_gear_menu (GEDIT_APP (g_application_get_default ()));
-       if (gear_menu)
+       hamburger_menu = _gedit_app_get_hamburger_menu (GEDIT_APP (g_application_get_default ()));
+       if (hamburger_menu)
        {
-               gtk_menu_button_set_menu_model (window->priv->gear_button, gear_menu);
-               gtk_menu_button_set_menu_model (window->priv->fullscreen_gear_button, gear_menu);
+               gtk_menu_button_set_menu_model (window->priv->gear_button, hamburger_menu);
+               gtk_menu_button_set_menu_model (window->priv->fullscreen_gear_button, hamburger_menu);
        }
        else
        {
diff --git a/gedit/gedit-window.h b/gedit/gedit-window.h
index 9763611..04241cf 100644
--- a/gedit/gedit-window.h
+++ b/gedit/gedit-window.h
@@ -138,14 +138,14 @@ GeditTab        *gedit_window_get_tab_from_location       (GeditWindow         *window
 /* Message bus */
 GeditMessageBus        *gedit_window_get_message_bus           (GeditWindow         *window);
 
-GMenuModel       *_gedit_window_get_gear_menu           (GeditWindow         *window);
-
 /*
  * Non exported functions
  */
 GtkWidget      *_gedit_window_get_multi_notebook       (GeditWindow         *window);
 GtkWidget      *_gedit_window_get_notebook             (GeditWindow         *window);
 
+GMenuModel     *_gedit_window_get_hamburger_menu       (GeditWindow         *window);
+
 GeditWindow    *_gedit_window_move_tab_to_new_window   (GeditWindow         *window,
                                                         GeditTab            *tab);
 void             _gedit_window_move_tab_to_new_tab_group(GeditWindow         *window,
diff --git a/gedit/resources/gtk/menus.ui b/gedit/resources/gtk/menus.ui
index 4f6ea3f..6fd2e9a 100644
--- a/gedit/resources/gtk/menus.ui
+++ b/gedit/resources/gtk/menus.ui
@@ -36,7 +36,7 @@
       </item>
     </section>
   </menu>
-  <menu id="gear-menu">
+  <menu id="hamburger-menu">
     <section>
       <attribute name="id">juntion-section</attribute>
       <attribute name="display-hint">horizontal-buttons</attribute>