diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-03 00:25:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-03 00:25:06 +0000 |
| commit | 8b77374789ae7f5ec237a3c870db76add225890c (patch) | |
| tree | b8801df287ae47926ad5a0a0fb5359cf68c1af0c | |
| parent | 4492978d319360ca6804a69130d6793b9399f458 (diff) | |
| download | gtk+-8b77374789ae7f5ec237a3c870db76add225890c.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmenubar.c | 5 |
4 files changed, 13 insertions, 4 deletions
@@ -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 2db19ebdbe..bacb8a9d48 100644 --- 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 64d1efc0b9..b7d997799e 100644 --- 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 f87453cadb..ad8fc2e68b 100644 --- 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; |