talons

commit 6fe006f667c2b0a16b3dbe83a983dca72e147af0
parent 8f0b480c77f760197b01d431bc4445cd095392d7
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 25 Jul 2010 15:05:26 +0000

2010-07-25 [colin]	3.7.6cvs21

	* src/common/utils.c
		Remove stupid and extraneous g_free() of elements
		which have just been freed by g_list_remove(). (see
		GList documentation). I don't know how it worked before

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
2
--

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-25 [colin]	3.7.6cvs21
+
+	* src/common/utils.c
+		Remove stupid and extraneous g_free() of elements
+		which have just been freed by g_list_remove(). (see
+		GList documentation). I don't know how it worked before
+
 2010-07-25 [colin]	3.7.6cvs20
 
 	* src/common/utils.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4016,3 +4016,4 @@
 ( cvs diff -u -r 1.1.2.94 -r 1.1.2.95 src/gtk/quicksearch.c;  ) > 3.7.6cvs18.patchset
 ( cvs diff -u -r 1.1.2.95 -r 1.1.2.96 src/gtk/quicksearch.c;  ) > 3.7.6cvs19.patchset
 ( cvs diff -u -r 1.36.2.184 -r 1.36.2.185 src/common/utils.c;  ) > 3.7.6cvs20.patchset
+( cvs diff -u -r 1.36.2.185 -r 1.36.2.186 src/common/utils.c;  ) > 3.7.6cvs21.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -1002,7 +1002,6 @@ GList *add_history(GList *list, const gchar *str)
 
 	old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)strcmp2);
 	if (old) {
-		g_free(old->data);
 		list = g_list_remove(list, old->data);
 	} else if (g_list_length(list) >= MAX_HISTORY_SIZE) {
 		GList *last;
@@ -1010,7 +1009,6 @@ GList *add_history(GList *list, const gchar *str)
 		last = g_list_last(list);
 		if (last) {
 			list = g_list_remove(list, last->data);
-			g_free(last->data);
 		}
 	}