Treat "" like NULL when parsing the menu-bar-accel setting. Here too.

2006-07-02  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkmenubar.c (window_key_press_handler): Treat
        "" like NULL when parsing the menu-bar-accel setting.
        * gtk/gtkmenu.c (gtk_menu_key_press): Here too.
        (#346420, Yevgen Muntyan)

diff --git a/ChangeLog b/ChangeLog
index 2db19ebdbe2d028cc011486351e8fa6d2e059703..bacb8a9d484bd674e4e0e2fa3d6d163f2a6070e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+       
+       * gtk/gtkmenubar.c (window_key_press_handler): Treat
+       "" like NULL when parsing the menu-bar-accel setting.   
+       * gtk/gtkmenu.c (gtk_menu_key_press): Here too.  
+       (#346420, Yevgen Muntyan)
 
        * configure.in: Require cairo 1.2 and GLib 2.12,
        set version to 2.10

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2db19ebdbe2d028cc011486351e8fa6d2e059703..bacb8a9d484bd674e4e0e2fa3d6d163f2a6070e7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,9 @@
 2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+       
+       * gtk/gtkmenubar.c (window_key_press_handler): Treat
+       "" like NULL when parsing the menu-bar-accel setting.   
+       * gtk/gtkmenu.c (gtk_menu_key_press): Here too.  
+       (#346420, Yevgen Muntyan)
 
        * configure.in: Require cairo 1.2 and GLib 2.12,
        set version to 2.10

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 64d1efc0b9823f813a711b221899e3990f265086..b7d997799e4ad378efa5db2d13156904dd8d18ca 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2688,7 +2688,7 @@ gtk_menu_key_press (GtkWidget     *widget,
                "gtk-can-change-accels", &can_change_accels,
                 NULL);
 
-  if (accel)
+  if (accel && *accel)
     {
       guint keyval = 0;
       GdkModifierType mods = 0;

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index f87453cadb33a631b494fdad44e03644478641c5..ad8fc2e68b876cfba1d112ef8791dfad2fed2695 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -594,11 +594,10 @@ window_key_press_handler (GtkWidget   *widget,
   gboolean retval = FALSE;
   
   g_object_get (gtk_widget_get_settings (widget),
-                "gtk-menu-bar-accel",
-                &accel,
+                "gtk-menu-bar-accel", &accel,
                 NULL);
 
-  if (accel)
+  if (accel && *accel)
     {
       guint keyval = 0;
       GdkModifierType mods = 0;