summaryrefslogtreecommitdiff
path: root/gtk/gtkmenubar.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-07-03 00:25:06 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-07-03 00:25:06 +0000
commit8b77374789ae7f5ec237a3c870db76add225890c (patch)
treeb8801df287ae47926ad5a0a0fb5359cf68c1af0c /gtk/gtkmenubar.c
parent4492978d319360ca6804a69130d6793b9399f458 (diff)
downloadgtk+-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)
Diffstat (limited to 'gtk/gtkmenubar.c')
-rw-r--r--gtk/gtkmenubar.c5
1 files changed, 2 insertions, 3 deletions
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;