save last used quicksearch type

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 396455ad69dca673ec2eee6be71e910cdc9cdc16..54239b27c25252d1dd1e52aa5710fc22a1421559 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-12-11 [colin]       0.8.6claws99
+
+       * src/prefs_common.[ch]
+               Add summary_quicksearch_type
+       * src/summaryview.c
+               Save last used quicksearch type
+
 2002-12-11 [jens]       0.8.6claws98
        * src/prefs_filtering.c
        * src/prefs_matcher.c

diff --git a/configure.in b/configure.in
index a5a089ef3d536db1790614e41dd01cd1621a48b5..05ff73e418826490f5c192ee05e229a3c0de7f63 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws98
+EXTRA_VERSION=claws99
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_common.c b/src/prefs_common.c
index f246894e695cdf18f05707d3bd21496a5b7d8743..d51161bdabe06a6535c070f976823a5a9384c9e2 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -813,6 +813,8 @@ static PrefParam param[] = {
 #endif
        {"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
         NULL, NULL, NULL},
+       {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
+        NULL, NULL, NULL},
 
        {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},

diff --git a/src/prefs_common.h b/src/prefs_common.h
index f83d97a73df66e0076c477416748a5182e7c7568..c6800314035b68276f65481e902c3c40a9a54e56 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -267,6 +267,8 @@ struct _PrefsCommon
        /* boolean for work offline 
           stored here for use in inc.c */
        gboolean work_offline;
+       
+       gint summary_quicksearch_type;
 
 };
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 3892a8d47bf8edde907cc41bd88eaa2224540277..acd293c48dc280254b964afc70583192e28c846d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -571,6 +571,9 @@ SummaryView *summary_create(void)
                           summaryview);
 
        gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
+       
+       gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
+       
        gtk_widget_show(search_type);
        
        search_string = gtk_entry_new();
@@ -4674,6 +4677,10 @@ static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
 static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
        SummaryView *sw = (SummaryView *)data;
+       prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+                                  GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+                                  GTK_MENU(sw->search_type))))));
+
        if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
                summary_show(sw, sw->folder_item);
 }