From: Colin Leroy Date: Sat, 24 Jul 2010 17:02:17 +0000 (+0000) Subject: 2010-07-24 [colin] 3.7.6cvs19 X-Git-Tag: REL_3_7_7~48 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f5040a8bf8ead51774368c0023ebabdf9ad0ffff 2010-07-24 [colin] 3.7.6cvs19 * src/gtk/quicksearch.c Finish 3.7.5cvs42 patch. Probably fixes bug 2232, 'freeze when using quick search' --- diff --git a/ChangeLog b/ChangeLog index 75645a91a..35f10a16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-24 [colin] 3.7.6cvs19 + + * src/gtk/quicksearch.c + Finish 3.7.5cvs42 patch. Probably fixes bug 2232, + 'freeze when using quick search' + 2010-07-11 [iwkse] 3.7.6cvs18 * src/gtk/quicksearch.c diff --git a/PATCHSETS b/PATCHSETS index 7996bbc36..b8824191c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4014,3 +4014,4 @@ ( cvs diff -u -r 1.274.2.312 -r 1.274.2.313 src/mainwindow.c; cvs diff -u -r 1.1.2.93 -r 1.1.2.94 src/gtk/quicksearch.c; ) > 3.7.6cvs16.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 diff --git a/configure.ac b/configure.ac index 85c10afc1..e0fd66249 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=18 +EXTRA_VERSION=19 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c index 513d0a2c8..250146e02 100644 --- a/src/gtk/quicksearch.c +++ b/src/gtk/quicksearch.c @@ -226,19 +226,19 @@ static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast) if (quicksearch->matcher_list) { quicksearch->extended_search_strings = add_history(quicksearch->extended_search_strings, - search_string); + g_strdup(search_string)); prefs_common.summary_quicksearch_history = add_history(prefs_common.summary_quicksearch_history, - search_string); + g_strdup(search_string)); } break; default: quicksearch->normal_search_strings = add_history(quicksearch->normal_search_strings, - search_string); + g_strdup(search_string)); prefs_common.summary_quicksearch_history = add_history(prefs_common.summary_quicksearch_history, - search_string); + g_strdup(search_string)); break; } @@ -1402,7 +1402,7 @@ void quicksearch_set_search_strings(QuickSearch *quicksearch) quicksearch->normal_search_strings = g_list_append( quicksearch->normal_search_strings, - strings->data); + g_strdup(strings->data)); g_free(newstr); continue; }