gnome-terminal r2752 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:50:57 2008
New Revision: 2752
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2752&view=rev

Log:
Rename the menu-bar-accel property.
Fix the property notification in TerminalWindow on initialisation to not abort after the first property name.
Use NULL to disable the menubar accel, instead of a bogusly impossible key combination.


Modified:
   trunk/src/terminal-accels.c
   trunk/src/terminal-app.c
   trunk/src/terminal-app.h
   trunk/src/terminal-screen.c
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-accels.c
==============================================================================
--- trunk/src/terminal-accels.c	(original)
+++ trunk/src/terminal-accels.c	Thu May 29 19:50:57 2008
@@ -807,7 +807,7 @@
   app = terminal_app_get ();
   terminal_util_bind_object_property_to_widget (G_OBJECT (app), TERMINAL_APP_ENABLE_MNEMONICS,
                                                 disable_mnemonics_button, FLAG_INVERT_BOOL);
-  terminal_util_bind_object_property_to_widget (G_OBJECT (app), TERMINAL_APP_ENABLE_MENU_ACCELS,
+  terminal_util_bind_object_property_to_widget (G_OBJECT (app), TERMINAL_APP_ENABLE_MENU_BAR_ACCEL,
                                                 disable_menu_accel_button, FLAG_INVERT_BOOL);
 
   /* Column 1 */

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:50:57 2008
@@ -109,7 +109,7 @@
 {
   PROP_0,
   PROP_DEFAULT_PROFILE,
-  PROP_ENABLE_MENU_ACCELS,
+  PROP_ENABLE_MENU_BAR_ACCEL,
   PROP_ENABLE_MNEMONICS,
   PROP_SYSTEM_FONT,
 };
@@ -138,8 +138,8 @@
 #define ENABLE_MNEMONICS_KEY CONF_GLOBAL_PREFIX "/use_mnemonics"
 #define DEFAULT_ENABLE_MNEMONICS (TRUE)
 
-#define ENABLE_MENU_ACCELS_KEY CONF_GLOBAL_PREFIX"/use_menu_accelerators"
-#define DEFAULT_ENABLE_MENU_ACCELS (TRUE)
+#define ENABLE_MENU_BAR_ACCEL_KEY CONF_GLOBAL_PREFIX"/use_menu_accelerators"
+#define DEFAULT_ENABLE_MENU_BAR_ACCEL (TRUE)
 
 #define PROFILE_LIST_KEY CONF_GLOBAL_PREFIX "/profile_list"
 #define DEFAULT_PROFILE_KEY CONF_GLOBAL_PREFIX "/default_profile"
@@ -964,7 +964,7 @@
   GConfValue *gconf_value;
   gboolean enable;
 
-  if (strcmp (gconf_entry_get_key (entry), ENABLE_MENU_ACCELS_KEY) != 0)
+  if (strcmp (gconf_entry_get_key (entry), ENABLE_MENU_BAR_ACCEL_KEY) != 0)
     return;
 
   gconf_value = gconf_entry_get_value (entry);
@@ -976,7 +976,7 @@
     return;
 
   app->enable_menu_accels = enable;
-  g_object_notify (G_OBJECT (app), TERMINAL_APP_ENABLE_MENU_ACCELS);
+  g_object_notify (G_OBJECT (app), TERMINAL_APP_ENABLE_MENU_BAR_ACCEL);
 }
 
 static void
@@ -1484,14 +1484,14 @@
 
   app->enable_menu_accels_notify_id =
     gconf_client_notify_add (app->conf,
-                             ENABLE_MENU_ACCELS_KEY,
+                             ENABLE_MENU_BAR_ACCEL_KEY,
                              terminal_app_enable_menu_accels_notify_cb,
                              app, NULL, NULL);
 
   gconf_client_notify (app->conf, PROFILE_LIST_KEY);
   gconf_client_notify (app->conf, DEFAULT_PROFILE_KEY);
   gconf_client_notify (app->conf, MONOSPACE_FONT_KEY);
-  gconf_client_notify (app->conf, ENABLE_MENU_ACCELS_KEY);
+  gconf_client_notify (app->conf, ENABLE_MENU_BAR_ACCEL_KEY);
   gconf_client_notify (app->conf, ENABLE_MNEMONICS_KEY);
 
   terminal_accels_init ();
@@ -1559,7 +1559,7 @@
         else
           g_value_take_boxed (value, pango_font_description_from_string (DEFAULT_MONOSPACE_FONT));
         break;
-      case PROP_ENABLE_MENU_ACCELS:
+      case PROP_ENABLE_MENU_BAR_ACCEL:
         g_value_set_boolean (value, app->enable_menu_accels);
         break;
       case PROP_ENABLE_MNEMONICS:
@@ -1584,9 +1584,9 @@
 
   switch (prop_id)
     {
-      case PROP_ENABLE_MENU_ACCELS:
+      case PROP_ENABLE_MENU_BAR_ACCEL:
         app->enable_menu_accels = g_value_get_boolean (value);
-        gconf_client_set_bool (app->conf, ENABLE_MENU_ACCELS_KEY, app->enable_menu_accels, NULL);
+        gconf_client_set_bool (app->conf, ENABLE_MENU_BAR_ACCEL_KEY, app->enable_menu_accels, NULL);
         break;
       case PROP_ENABLE_MNEMONICS:
         app->enable_mnemonics = g_value_get_boolean (value);
@@ -1630,9 +1630,9 @@
 
   g_object_class_install_property
     (object_class,
-     PROP_ENABLE_MENU_ACCELS,
-     g_param_spec_boolean (TERMINAL_APP_ENABLE_MENU_ACCELS, NULL, NULL,
-                           DEFAULT_ENABLE_MENU_ACCELS,
+     PROP_ENABLE_MENU_BAR_ACCEL,
+     g_param_spec_boolean (TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, NULL, NULL,
+                           DEFAULT_ENABLE_MENU_BAR_ACCEL,
                            G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property

Modified: trunk/src/terminal-app.h
==============================================================================
--- trunk/src/terminal-app.h	(original)
+++ trunk/src/terminal-app.h	Thu May 29 19:50:57 2008
@@ -33,10 +33,10 @@
 
 #define GNOME_TERMINAL_ICON_NAME "utilities-terminal"
 
-#define TERMINAL_APP_DEFAULT_PROFILE    "default-profile"
-#define TERMINAL_APP_ENABLE_MENU_ACCELS "enable-menu-accels"
-#define TERMINAL_APP_ENABLE_MNEMONICS   "enable-mnemonics"
-#define TERMINAL_APP_SYSTEM_FONT        "system-font"
+#define TERMINAL_APP_DEFAULT_PROFILE        "default-profile"
+#define TERMINAL_APP_ENABLE_MENU_BAR_ACCEL  "enable-menu-accels"
+#define TERMINAL_APP_ENABLE_MNEMONICS       "enable-mnemonics"
+#define TERMINAL_APP_SYSTEM_FONT            "system-font"
 
 /* TerminalApp */
 

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:50:57 2008
@@ -33,7 +33,6 @@
 
 #include "terminal-accels.h"
 #include "terminal-app.h"
-#include "terminal-app.h"
 #include "terminal-intl.h"
 #include "terminal-profile.h"
 #include "terminal-screen-container.h"

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:50:57 2008
@@ -191,9 +191,6 @@
 
 /* Menubar mnemonics & accel settings handling */
 
-/* no one will ever press this ;-) */
-#define IMPOSSIBLE_MENUBAR_ACCEL "<Shift><Control><Mod1><Mod2><Mod3><Mod4><Mod5>F10"
-
 static void
 app_setting_notify_cb (TerminalApp *app,
                        GParamSpec *pspec,
@@ -216,7 +213,8 @@
       g_object_get (app, TERMINAL_APP_ENABLE_MNEMONICS, &enable_mnemonics, NULL);
       g_object_set (settings, "gtk-enable-mnemonics", enable_mnemonics, NULL);
     }
-  else if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MENU_ACCELS))
+
+  if (!prop_name || prop_name == I_(TERMINAL_APP_ENABLE_MENU_BAR_ACCEL))
     {
       /* const */ char *saved_menubar_accel;
       gboolean enable_menu_accels;
@@ -234,11 +232,11 @@
                                   saved_menubar_accel, (GDestroyNotify) g_free);
         }
 
-      g_object_get (app, TERMINAL_APP_ENABLE_MENU_ACCELS, &enable_menu_accels, NULL);
+      g_object_get (app, TERMINAL_APP_ENABLE_MENU_BAR_ACCEL, &enable_menu_accels, NULL);
       if (enable_menu_accels)
         g_object_set (settings, "gtk-menu-bar-accel", saved_menubar_accel, NULL);
       else
-        g_object_set (settings, "gtk-menu-bar-accel", IMPOSSIBLE_MENUBAR_ACCEL, NULL);
+        g_object_set (settings, "gtk-menu-bar-accel", NULL, NULL);
     }
 }
 
@@ -1121,7 +1119,7 @@
   app_setting_notify_cb (app, NULL, screen);
   g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MNEMONICS,
                     G_CALLBACK (app_setting_notify_cb), screen);
-  g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MENU_ACCELS,
+  g_signal_connect (app, "notify::" TERMINAL_APP_ENABLE_MENU_BAR_ACCEL,
                     G_CALLBACK (app_setting_notify_cb), screen);
 }