2008-11-28 [colin] 3.6.1cvs52

	* src/mimeview.c
		Fix leak

diff --git a/ChangeLog b/ChangeLog
index d7dd54db6d49ae8659d5d7a0dd828b9f95a71265..869439f37e64d2d62b7f9f559ce1d4a27fa2b221 100644 (file)
--- 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
index 1b76285342ad3006f4a1866b4902ddbf51f23d55..891ced744a647bfabac29a8e4b636f1eb42f6ba5 100644 (file)
--- 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
index 2f08e1a4bdd0b25b8f85cbc4a265359330e6d01c..7e54e61374655d6c244b54c40ad49b79039ce0f3 100644 (file)
--- 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
index e8f7d8630477306942e6cd22d6a1ff65ea763999..850d58905a5b55fc2033c17f610fb7ab561c4dd9 100644 (file)
--- 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);