Prevent unwanted recursion by resetting icon_set->cache before freeing the

Sat Jun 26 01:04:31 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkiconfactory.c (clear_cache): Prevent unwanted
	recursion by resetting icon_set->cache before freeing
	the cache.  (#144947, Tim Janik)

diff --git a/ChangeLog b/ChangeLog
index 64977af0c39369d84d1f073be4a9998ce326c457..46cbfe342f17610293704db1fc955cf2e41e4ea3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 26 01:04:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (clear_cache): Prevent unwanted 
+       recursion by resetting icon_set->cache before freeing
+       the cache.  (#144947, Tim Janik)
+
 Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 64977af0c39369d84d1f073be4a9998ce326c457..46cbfe342f17610293704db1fc955cf2e41e4ea3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jun 26 01:04:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (clear_cache): Prevent unwanted 
+       recursion by resetting icon_set->cache before freeing
+       the cache.  (#144947, Tim Janik)
+
 Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 64977af0c39369d84d1f073be4a9998ce326c457..46cbfe342f17610293704db1fc955cf2e41e4ea3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jun 26 01:04:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (clear_cache): Prevent unwanted 
+       recursion by resetting icon_set->cache before freeing
+       the cache.  (#144947, Tim Janik)
+
 Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 64977af0c39369d84d1f073be4a9998ce326c457..46cbfe342f17610293704db1fc955cf2e41e4ea3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jun 26 01:04:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkiconfactory.c (clear_cache): Prevent unwanted 
+       recursion by resetting icon_set->cache before freeing
+       the cache.  (#144947, Tim Janik)
+
 Sat Jun 26 00:40:02 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (render_icon_name_pixbuf): 

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 52b50e8642f7562105c6bb3ce4d2269203751183..a8dd18bd0e5f16f4a476f9069426b337c16c6a8e 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2654,10 +2654,13 @@ static void
 clear_cache (GtkIconSet *icon_set,
              gboolean    style_detach)
 {
-  GSList *tmp_list;
+  GSList *cache, *tmp_list;
   GtkStyle *last_style = NULL;
 
-  tmp_list = icon_set->cache;
+  cache = icon_set->cache;
+  icon_set->cache = NULL;
+  icon_set->cache_size = 0;
+  tmp_list = cache;
   while (tmp_list != NULL)
     {
       CachedIcon *icon = tmp_list->data;
@@ -2681,9 +2684,7 @@ clear_cache (GtkIconSet *icon_set,
       tmp_list = g_slist_next (tmp_list);
     }
 
-  g_slist_free (icon_set->cache);
-  icon_set->cache = NULL;
-  icon_set->cache_size = 0;
+  g_slist_free (cache);
 }
 
 static GSList*