callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2004-06-26 05:08:36 +00:00 committed by Matthias Clasen
parent 957743919b
commit 0f9a4da84d
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf): * gtk/gtkiconfactory.c (render_icon_name_pixbuf):

6
ChangeLog.pre-2-10
View File

@ -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> Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf): * gtk/gtkiconfactory.c (render_icon_name_pixbuf):

6
ChangeLog.pre-2-6
View File

@ -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> Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf): * gtk/gtkiconfactory.c (render_icon_name_pixbuf):

6
ChangeLog.pre-2-8
View File

@ -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> Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf): * gtk/gtkiconfactory.c (render_icon_name_pixbuf):

11
gtk/gtkiconfactory.c
View File

@ -2654,10 +2654,13 @@ static void
clear_cache (GtkIconSet *icon_set, clear_cache (GtkIconSet *icon_set,
gboolean style_detach) gboolean style_detach)
{ {
GSList *tmp_list; GSList *cache, *tmp_list;
GtkStyle *last_style = NULL; 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) while (tmp_list != NULL)
{ {
CachedIcon *icon = tmp_list->data; CachedIcon *icon = tmp_list->data;
@ -2681,9 +2684,7 @@ clear_cache (GtkIconSet *icon_set,
tmp_list = g_slist_next (tmp_list); tmp_list = g_slist_next (tmp_list);
} }
g_slist_free (icon_set->cache); g_slist_free (cache);
icon_set->cache = NULL;
icon_set->cache_size = 0;
} }
static GSList* static GSList*