diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/prefs_filter_edit.c | 7 | ||||
| -rw-r--r-- | src/query_search.c | 3 |
3 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2011-01-06 + * src/query_search.c + src/prefs_filter_edit.c: made the default boolean type of query + search and filter condition AND. + +2011-01-06 + * src/textview.c: added context menu 'Reply to this address'. 2011-01-05 diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c index cfdd0de1..ce00fde3 100644 --- a/src/prefs_filter_edit.c +++ b/src/prefs_filter_edit.c @@ -273,6 +273,7 @@ static void prefs_filter_edit_create(void) MENUITEM_ADD(menu, menuitem, _("If all of the following conditions match"), FLT_AND); gtk_option_menu_set_menu(GTK_OPTION_MENU(bool_op_optmenu), menu); + gtk_option_menu_set_history(GTK_OPTION_MENU(bool_op_optmenu), FLT_AND); cond_scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(cond_scrolled_win); @@ -369,7 +370,7 @@ static void prefs_filter_edit_clear(void) static void prefs_filter_edit_rule_to_dialog(FilterRule *rule, const gchar *default_name) { - gint index = 0; + gint index = 1; static gint count = 1; if (rule && rule->name) @@ -390,7 +391,7 @@ static void prefs_filter_edit_rule_to_dialog(FilterRule *rule, (GTK_OPTION_MENU(rule_edit_window.bool_op_optmenu), GINT_TO_POINTER(rule->bool_op), NULL); if (index < 0) - index = 0; + index = 1; } if (index >= 0) { gtk_option_menu_set_history @@ -1955,7 +1956,7 @@ static FilterRule *prefs_filter_edit_dialog_to_rule(void) FilterRule *rule = NULL; GSList *cur; const gchar *rule_name; - FilterBoolOp bool_op = FLT_OR; + FilterBoolOp bool_op; GSList *cond_list = NULL; GSList *action_list = NULL; GtkWidget *bool_op_menuitem; diff --git a/src/query_search.c b/src/query_search.c index d541f9c7..193a6720 100644 --- a/src/query_search.c +++ b/src/query_search.c @@ -278,6 +278,7 @@ static void query_search_create(void) MENUITEM_ADD(bool_menu, menuitem, _("Match all of the following"), FLT_AND); gtk_option_menu_set_menu(GTK_OPTION_MENU(bool_optmenu), bool_menu); + gtk_option_menu_set_history(GTK_OPTION_MENU(bool_optmenu), FLT_AND); hbbox = gtk_hbutton_box_new(); gtk_widget_show(hbbox); @@ -463,7 +464,7 @@ static FilterRule *query_search_dialog_to_rule(const gchar *name, { const gchar *id; FolderItem *item_; - FilterBoolOp bool_op = FLT_OR; + FilterBoolOp bool_op; gboolean recursive; gboolean case_sens; GSList *cond_list; |