Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle accel_closure being NULL on an accel label. (#139641, Sam

Browse Source 
Tue Jun  1 22:41:03 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkmenu.c (get_accel_path): Handle accel_closure being
	NULL on an accel label. (#139641, Sam Stephenson, patch by
	Michael Natterer)
This commit is contained in:
Matthias Clasen
2004-06-02 02:44:44 +00:00
committed by Matthias Clasen
parent 3d7693a13c
commit f6e4a6ae2b
5 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Tue Jun 1 22:41:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmenu.c (get_accel_path): Handle accel_closure being
NULL on an accel label. (#139641, Sam Stephenson, patch by
Michael Natterer)
Tue Jun 1 22:19:55 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (theme_subdir_load): Prevent icon

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
Tue Jun 1 22:41:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmenu.c (get_accel_path): Handle accel_closure being
NULL on an accel label. (#139641, Sam Stephenson, patch by
Michael Natterer)
Tue Jun 1 22:19:55 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (theme_subdir_load): Prevent icon

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
Tue Jun 1 22:41:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmenu.c (get_accel_path): Handle accel_closure being
NULL on an accel label. (#139641, Sam Stephenson, patch by
Michael Natterer)
Tue Jun 1 22:19:55 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (theme_subdir_load): Prevent icon

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
Tue Jun 1 22:41:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmenu.c (get_accel_path): Handle accel_closure being
NULL on an accel label. (#139641, Sam Stephenson, patch by
Michael Natterer)
Tue Jun 1 22:19:55 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkicontheme.c (theme_subdir_load): Prevent icon

10
gtk/gtkmenu.c
View File

@@ -2525,9 +2525,13 @@ get_accel_path (GtkWidget *menu_item,
g_object_get (label,
"accel_closure", &accel_closure,
NULL);
accel_group = gtk_accel_group_from_accel_closure (accel_closure);
*locked = accel_group->lock_count > 0;
if (accel_closure)
{
accel_group = gtk_accel_group_from_accel_closure (accel_closure);
*locked = accel_group->lock_count > 0;
}
}
}
}