AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 13:30:19 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2006-07-03 00:25:06 +00:00 committed by Matthias Clasen
parent 4492978d31
commit 8b77374789
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

5
ChangeLog.pre-2-10
View File

@ -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

2
gtk/gtkmenu.c
View File

@ -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;

5
gtk/gtkmenubar.c
View File

@ -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;