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

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)

diff --git a/ChangeLog b/ChangeLog
index bcce53faa95d6e420d35404069dc8a46d3eea205..30c18447ad7b64e62abe5d034cc17654e3816353 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bcce53faa95d6e420d35404069dc8a46d3eea205..30c18447ad7b64e62abe5d034cc17654e3816353 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bcce53faa95d6e420d35404069dc8a46d3eea205..30c18447ad7b64e62abe5d034cc17654e3816353 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bcce53faa95d6e420d35404069dc8a46d3eea205..30c18447ad7b64e62abe5d034cc17654e3816353 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 29d9741fc8f91e49fc9be1ed04437a62e33b9324..353a6d0f39944f78dc3decca9206224e1a1f9824 100644 (file)
--- 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 35bfe197a1fd324242776c5c53a62138a317ff12..0ef126f3adf675d4c5033d55ffd261ba6535a085 100644 (file)
--- 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;
+               }
            }
        }
     }