From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sun, 26 Oct 2003 18:25:04 +0000 (+0000)
Subject: * src/summary_search.c
X-Git-Tag: rel_0_9_7~56
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=25ce4364f210a08883a14d081355d1c2418e50db

* src/summary_search.c
	fix misnomer and correct selecting initial search node
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f17632524..80bc8132f 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-10-26 [alfons]	0.9.6claws54
+
+	* src/summary_search.c
+		fix misnomer and correct selecting initial search node  
+
 2003-10-26 [christoph]	0.9.6claws53
 
 	* src/pgpmime.c
diff --git a/configure.ac b/configure.ac
index 7ce5aae9d..d867bc686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/summary_search.c b/src/summary_search.c
index 240e04045..65441188e 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -229,7 +229,7 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 	MsgInfo *msginfo;
 	gboolean case_sens;
 	gboolean backward;
-	gboolean search_all;
+	gboolean select_all;
 	gboolean search_and;
 	gboolean all_searched = FALSE;
 	gboolean all_matched = FALSE;
@@ -249,7 +249,7 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 		(GTK_TOGGLE_BUTTON(case_checkbtn));
 	backward = gtk_toggle_button_get_active
 		(GTK_TOGGLE_BUTTON(backward_checkbtn));
-	search_all = gtk_toggle_button_get_active
+	select_all = gtk_toggle_button_get_active
 		(GTK_TOGGLE_BUTTON(all_checkbtn));
 	search_and = gtk_toggle_button_get_active
 		(GTK_TOGGLE_BUTTON(and_checkbtn));
@@ -272,11 +272,11 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 	subjwcs = (wchar_t *)GTK_ENTRY(subject_entry)->text;
 	body_str = gtk_entry_get_text(GTK_ENTRY(body_entry));
 
-	if (search_all) {
+	if (select_all) {
 		gtk_clist_freeze(GTK_CLIST(ctree));
 		gtk_clist_unselect_all(GTK_CLIST(ctree));
-		node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-	} else if (!summaryview->selected) {
+	}
+	if (!summaryview->selected) {
 		if (backward)
 			node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
 		else
@@ -303,7 +303,7 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 			gchar *str;
 			AlertValue val;
 
-			if (search_all) {
+			if (select_all) {
 				gtk_clist_thaw(GTK_CLIST(ctree));
 				break;
 			}
@@ -375,7 +375,7 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 
 		if ((from_matched || to_matched || subj_matched || body_matched)
 		    && (!search_and || all_matched)) {
-			if (search_all)
+			if (select_all)
 				gtk_ctree_select(ctree, node);
 			else {
 				if (messageview_is_visible