2010-07-25 [colin] 3.7.6cvs20

	* src/common/utils.c
		Reverse free/use with more logical and safe
		use/free. Thanks to Michael Rasmussen !

diff --git a/ChangeLog b/ChangeLog
index 35f10a16bd20224d67577ad4842ae4c23b08f2e9..4c5ed252a12a11b452fb58c68b36aa3add825e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-25 [colin]     3.7.6cvs20
+
+       * src/common/utils.c
+               Reverse free/use with more logical and safe
+               use/free. Thanks to Michael Rasmussen !
+

 2010-07-24 [colin]     3.7.6cvs19
 
        * src/gtk/quicksearch.c
 2010-07-24 [colin]     3.7.6cvs19
 
        * src/gtk/quicksearch.c

diff --git a/PATCHSETS b/PATCHSETS
index b8824191c35b5c65c58f43ede608d513fac0f3dc..3ee4e45c4f7e0fe1c22a5dbda2eb6a33daab3790 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4015,3 +4015,4 @@
 ( cvs diff -u -r 1.39.2.58 -r 1.39.2.59 src/mainwindow.h;  ) > 3.7.6cvs17.patchset
 ( 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.39.2.58 -r 1.39.2.59 src/mainwindow.h;  ) > 3.7.6cvs17.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index e0fd662490d11f1eb4cdd03afff7cefd305fb65d..f73e93373403392b4c8fc0671285ccaf2af9c740 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=19
+EXTRA_VERSION=20

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 32baef37a012e14795eeb2b2cc1a3b6cc7624ae1..0ed84c1d8def3364073f2dae3385dd27762c432d 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1009,8 +1009,8 @@ GList *add_history(GList *list, const gchar *str)
 
                last = g_list_last(list);
                if (last) {
 
                last = g_list_last(list);
                if (last) {

-                       g_free(last->data);

                        list = g_list_remove(list, last->data);
                        list = g_list_remove(list, last->data);

+                       g_free(last->data);

                }
        }
 
                }
        }