talons

commit dcd4069361983720ca761ecf3f2fc94b4829fc35
parent e99295f22ac9e95608110fa8a2004ea73557fd39
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 28 Nov 2008 22:35:51 +0000

2008-11-28 [colin]	3.6.1cvs52

	* src/mimeview.c
		Fix leak

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mimeview.c
 | 
8
++++----

4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28 [colin]	3.6.1cvs52
+
+	* src/mimeview.c
+		Fix leak
+
 2008-11-28 [colin]	3.6.1cvs51
 
 	* po/fr.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -3633,3 +3633,4 @@
 ( cvs diff -u -r 1.6.2.9 -r 1.6.2.10 po/Makefile.in.in;  ) > 3.6.1cvs49.patchset
 ( cvs diff -u -r 1.274.2.291 -r 1.274.2.292 src/mainwindow.c;  ) > 3.6.1cvs50.patchset
 ( cvs diff -u -r 1.42.2.43 -r 1.42.2.44 po/fr.po;  ) > 3.6.1cvs51.patchset
+( cvs diff -u -r 1.83.2.148 -r 1.83.2.149 src/mimeview.c;  ) > 3.6.1cvs52.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=51
+EXTRA_VERSION=52
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -2377,15 +2377,15 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 
 static void icon_list_clear (MimeView *mimeview)
 {
-	GList     *child;
+	GList     *child, *orig;
 	GtkAdjustment *adj;
 		
-	child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
-	for (; child != NULL; child = g_list_next(child)) {
+	orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+	for (child = orig; child != NULL; child = g_list_next(child)) {
 		gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox), 
 				       GTK_WIDGET(child->data));
 	}
-	g_list_free(child);
+	g_list_free(orig);
 	mimeview->icon_count = 0;
 	adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 	gtk_adjustment_set_value(adj, adj->lower);