2010-03-27 [colin] 3.7.5cvs42

	* src/gtk/quicksearch.c
		Fix double-free later in code. Optimize
		list creation

diff --git a/ChangeLog b/ChangeLog
index 973c481e202c973e8c9ce29bb6850752700d9cc0..1c6b7c66d932d08c7bf8bd0cbeb762d8a4bde328 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-27 [colin]     3.7.5cvs42
+
+       * src/gtk/quicksearch.c
+               Fix double-free later in code. Optimize
+               list creation
+
 2010-03-27 [pawel]     3.7.5cvs41
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 85e2f6790b0f1a9879ae7203b38fc2b5e4ffb189..5171cda70b469b504d166415f7fe90b05b99a51b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3982,3 +3982,4 @@
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmclist.c;  ) > 3.7.5cvs39.patchset
 ( cvs diff -u -r 1.382.2.548 -r 1.382.2.549 src/compose.c;  cvs diff -u -r 1.50.2.59 -r 1.50.2.60 src/compose.h;  cvs diff -u -r 1.96.2.222 -r 1.96.2.223 src/textview.c;  ) > 3.7.5cvs40.patchset
 ( cvs diff -u -r 1.382.2.549 -r 1.382.2.550 src/compose.c;  ) > 3.7.5cvs41.patchset
+( cvs diff -u -r 1.1.2.90 -r 1.1.2.91 src/gtk/quicksearch.c;  ) > 3.7.5cvs42.patchset

diff --git a/configure.ac b/configure.ac
index 7f728533cbf00add354c7e29cfb621a5ab18c17b..47f19cf06d5f16e5e09743db3b9b1a1e9e8bdf5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 766b1ec2f0185243b45b29152276be14bbf9b4ee..19ba55694531c0510747dafaa5221b69efd643cd 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1377,18 +1377,21 @@ void quicksearch_set_search_strings(QuickSearch *quicksearch)
                        
                        if (matcher_list) {
                                quicksearch->extended_search_strings =
-                                       g_list_append(
+                                       g_list_prepend(
                                                quicksearch->extended_search_strings,
-                                               strings->data);
+                                               g_strdup(strings->data));
                                matcherlist_free(matcher_list);
                        } else
                                quicksearch->normal_search_strings =
-                                       g_list_append(
+                                       g_list_prepend(
                                                quicksearch->normal_search_strings,
-                                               strings->data);
+                                               g_strdup(strings->data));
                }
        
        } while ((strings = g_list_next(strings)) != NULL);
 
+       quicksearch->normal_search_strings = g_list_reverse(quicksearch->normal_search_strings);
+       quicksearch->extended_search_strings = g_list_reverse(quicksearch->extended_search_strings);
+
        quicksearch_set_popdown_strings(quicksearch);
 }