fix figuring accel path and changing behaviour.

Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.

diff --git a/ChangeLog b/ChangeLog
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8a22df19d0cf4851f7eae468e5bbbe799db8f4e1..908907d6b5edd6623b1990c9d7bc34843f484edf 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Wed Feb 13 13:26:39 2002  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkmenu.c: fix figuring accel path and changing behaviour.
+
 Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 29de7faa4d5e0d7fe5bde474bad49cbc457023ae..c2683d7019f46186be446121eefa04770f5cef35 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -259,7 +259,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels",
                                                       _("Can change accelerators"),
                                                       _("Whether menu accelerators can be changed by pressing a key over the menu item."),
-                                                      FALSE,
+                                                      TRUE,
                                                       G_PARAM_READWRITE));
 }
 
@@ -1767,8 +1767,7 @@ gtk_menu_key_press (GtkWidget     *widget,
     }
 
   g_object_get (G_OBJECT (gtk_settings_get_default ()),
-               "gtk-can-change-accels",
-               &can_change_accels,
+               "gtk-can-change-accels", &can_change_accels,
                NULL);
   
   accel_key = event->keyval;
@@ -1785,9 +1784,7 @@ gtk_menu_key_press (GtkWidget     *widget,
       gboolean replace_accels = TRUE;
       const gchar *path;
 
-      path = GTK_MENU_ITEM (menu_item)->accel_path;
-      if (!path)
-       path = _gtk_widget_get_accel_path (menu_item);
+      path = _gtk_widget_get_accel_path (menu_item);
       if (!path)
        {
          /* can't change accelerators on menu_items without paths