Commit 8b773747 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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)
parent 4492978d
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
......
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
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment