diff --git a/ChangeLog b/ChangeLog index bcce53faa9..30c18447ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Jun 1 22:45:42 2004 Matthias Clasen + + * 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 + + * 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 * gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bcce53faa9..30c18447ad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Tue Jun 1 22:45:42 2004 Matthias Clasen + + * 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 + + * 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 * gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bcce53faa9..30c18447ad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Tue Jun 1 22:45:42 2004 Matthias Clasen + + * 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 + + * 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 * gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bcce53faa9..30c18447ad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Tue Jun 1 22:45:42 2004 Matthias Clasen + + * 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 + + * 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 * gtk/gtkmenushell.c (gtk_menu_shell_button_release): Make menus diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 29d9741fc8..353a6d0f39 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -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); diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 35bfe197a1..0ef126f3ad 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -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; + } } } }