aboutsummaryrefslogtreecommitdiff
path: root/src/prefs_filter_edit.c
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2011-01-06 05:05:38 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2011-01-06 05:05:38 +0000
commit8fd3ee4dd058e85a1b27bc78d8747b765173c70d (patch)
tree1809e3d3238d542fb1f0e517c9e4da1149f5b8d7 /src/prefs_filter_edit.c
parent820b8d6b9d9c144a3ce0c45accd996eba580a4d3 (diff)
made the default boolean type of query search and filter condition AND.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2776 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/prefs_filter_edit.c')
-rw-r--r--src/prefs_filter_edit.c7
1 files changed, 4 insertions, 3 deletions
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;