[Xfce4-commits] <terminal:master> Simplify the F10 disable code.

[Nick Schermer]

Updating branch refs/heads/master
         to f4c4bdc68eac615801473b1e2af581eb18149413 (commit)
       from b123b72baf35bb154b9259a1a277629c92eab8cf (commit)

commit f4c4bdc68eac615801473b1e2af581eb18149413
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Dec 25 19:23:15 2012 +0100

    Simplify the F10 disable code.
    
    Setting an empty string is suficient here.

 terminal/terminal-app.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index f3e72cc..65d172a 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -186,20 +186,15 @@ terminal_app_finalize (GObject *object)
 static void
 terminal_app_update_accels (TerminalApp *app)
 {
-  const gchar *accel;
-  gboolean     shortcuts_no_menukey;
+  gboolean no_menukey;
 
   g_object_get (G_OBJECT (app->preferences),
-                "shortcuts-no-menukey", &shortcuts_no_menukey,
+                "shortcuts-no-menukey", &no_menukey,
                 NULL);
 
-  if (shortcuts_no_menukey)
-    accel = "<Shift><Control><Mod1><Mod2><Mod3><Mod4><Mod5>F10";
-  else
-    accel = app->initial_menu_bar_accel;
-
   gtk_settings_set_string_property (gtk_settings_get_default (),
-                                    "gtk-menu-bar-accel", accel,
+                                    "gtk-menu-bar-accel",
+                                    no_menukey ? "" : app->initial_menu_bar_accel,
                                     PACKAGE_NAME);
 }