AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Tue Jun  1 22:45:42 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
	lookup finding icons in the wrong prefix.  (#143328,
	Mark McLoughlin)
This commit is contained in:
Matthias Clasen 2004-06-02 02:48:50 +00:00 committed by Matthias Clasen
parent 01a5698e1d
commit 018511c3aa
6 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Tue Jun 1 22:45:42 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
lookup finding icons in the wrong prefix. (#143328,
Mark McLoughlin)
Wed Jun 2 00:39:58 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
Tue Jun 1 22:45:42 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
lookup finding icons in the wrong prefix. (#143328,
Mark McLoughlin)
Wed Jun 2 00:39:58 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
Tue Jun 1 22:45:42 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
lookup finding icons in the wrong prefix. (#143328,
Mark McLoughlin)
Wed Jun 2 00:39:58 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
Tue Jun 1 22:45:42 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
lookup finding icons in the wrong prefix. (#143328,
Mark McLoughlin)
Wed Jun 2 00:39:58 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus

2
gtk/gtkicontheme.c
View File

@ -1935,7 +1935,7 @@ theme_subdir_load (GtkIconTheme *icon_theme,
scan_directory (icon_theme->priv, dir, full_dir);
theme->dirs = g_list_append (theme->dirs, dir);
theme->dirs = g_list_prepend (theme->dirs, dir);
}
else
g_free (full_dir);

9
gtk/gtkmenu.c
View File

@ -2564,9 +2564,12 @@ 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;
}
}
}
}