* src/mainwindow.c

* src/summaryview.c
	Quicksearch bugfixes:
	- hide help button at startup if not extended
	- switch to extended when looking for replies

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 95ef670f8149c6543647dd92f8430bd27fa7f8b8..055eefc2f98d097ae3ba49e8c6aa91174f91f2c7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-01-17 [colin]     0.8.8claws109
+       
+       * src/mainwindow.c
+       * src/summaryview.c
+               Quicksearch bugfixes: 
+               - hide help button at startup if not extended
+               - switch to extended when looking for replies
+
 2003-01-17 [paul]
 
        * sync with 0.8.9 release

diff --git a/configure.ac b/configure.ac
index 47a7470cba8fb6c16aafaa7505d3af0494fa7967..a5da3fe762b56d9648feefd91931744ab2a17ebb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws108
+EXTRA_VERSION=claws109
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mainwindow.c b/src/mainwindow.c
index d9162786ede64199f0060b1bf48a66159cd5c103..50a6c68edbdc565e91f9bd7ddf9db5f5f5c11ce9 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -944,9 +944,11 @@ MainWindow *main_window_create(SeparateType type)
        
        gtk_widget_hide(GTK_WIDGET(mainwin->summaryview->hbox_search));
        
-       if (prefs_common.show_searchbar)
+       if (prefs_common.show_searchbar) {
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mainwin->summaryview->toggle_search), TRUE);
-
+               if (prefs_common.summary_quicksearch_type != S_SEARCH_EXTENDED)
+                       gtk_widget_hide(summaryview->search_description);
+       }
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget

diff --git a/src/summaryview.c b/src/summaryview.c
index b286b5158c30657183cb293469d3e5ef84cfe19c..20d7bf3ff7d40bbb5a9f513efc811e19663bfa10 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5462,7 +5462,10 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
                folderview_select(summaryview->mainwin->folderview, sent_folder);
        }
        
+       gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
+                                   S_SEARCH_EXTENDED);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
+
        gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
        g_free(buf);
        summary_show(summaryview, summaryview->folder_item);