projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2010-02-10 [colin] 3.7.5cvs17
[claws.git] / src / prefs_matcher.c
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 45182177477f538acb5ed15cfffac65c8d439d7e..4cfc74ff5c81ce9919e0c415352aec6514f65f8d 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-#undef GTK_DISABLE_DEPRECATED /* Fixme GtkOptionMenu */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -91,7 +90,9 @@ static struct Matcher {
        GtkWidget *numeric_label;
        GtkWidget *addressbook_folder_combo;
        GtkWidget *case_checkbtn;
+#ifndef G_OS_WIN32
        GtkWidget *regexp_checkbtn;
+#endif
        GtkWidget *color_optmenu;
 
        GtkWidget *test_btn;
@@ -169,7 +170,10 @@ enum {
        CRITERIA_FOUND_IN_ADDRESSBOOK = 34,
        
        CRITERIA_TAG = 35,
-       CRITERIA_TAGGED = 36
+       CRITERIA_TAGGED = 36,
+
+       CRITERIA_HAS_ATTACHMENT = 37,
+       CRITERIA_SIGNED = 38
 };
 
 enum {
@@ -355,6 +359,7 @@ static void prefs_matcher_models_create(void)
        COMBOBOX_ADD(store, "X-Mailer", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "X-BeenThere", CRITERIA_HEADER);
        COMBOBOX_ADD(store, "List-Post", CRITERIA_HEADER);
+       COMBOBOX_ADD(store, "List-Id", CRITERIA_HEADER);
        matcher.model_headers = GTK_TREE_MODEL(store);
        
        store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
@@ -372,6 +377,8 @@ static void prefs_matcher_models_create(void)
        COMBOBOX_ADD(store, _("Forwarded"), CRITERIA_FORWARDED);
        COMBOBOX_ADD(store, _("Locked"), CRITERIA_LOCKED);
        COMBOBOX_ADD(store, _("Spam"), CRITERIA_SPAM);
+       COMBOBOX_ADD(store, _("Has attachment"), CRITERIA_HAS_ATTACHMENT);
+       COMBOBOX_ADD(store, _("Signed"), CRITERIA_SIGNED);
        matcher.model_flags = GTK_TREE_MODEL(store);
        
        store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
@@ -435,6 +442,7 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
        prefs_matcher_set_dialog(matchers);
 
        gtk_widget_show(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), TRUE);
 }
 
 /*!
@@ -443,7 +451,7 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
 static void prefs_matcher_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation)
 {
-       g_return_if_fail(allocation != NULL);
+       cm_return_if_fail(allocation != NULL);
 
        prefs_common.matcherwin_width = allocation->width;
        prefs_common.matcherwin_height = allocation->height;
@@ -492,7 +500,9 @@ static void prefs_matcher_create(void)
        GtkWidget *numeric_entry;
        GtkWidget *numeric_label;
        
+#ifndef G_OS_WIN32
        GtkWidget *regexp_checkbtn;
+#endif
        GtkWidget *case_checkbtn;
 
        GtkWidget *reg_hbox;
@@ -525,7 +535,6 @@ static void prefs_matcher_create(void)
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_matcher");
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 
        vbox = gtk_vbox_new(FALSE, 6);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -624,7 +633,7 @@ static void prefs_matcher_create(void)
        headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
        gtk_widget_set_size_request(headers_combo, 100, -1);
        gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
-       header_entry = GTK_BIN (headers_combo)->child;
+       header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
        
        criteria_combo2 = gtkut_sc_combobox_create(NULL, TRUE);
        prefs_matcher_set_model(criteria_combo2, matcher.model_phrase);
@@ -667,7 +676,7 @@ static void prefs_matcher_create(void)
                              Q_("Filtering Matcher Menu|All"), _("Any"),
                              "From", "To", "Cc", "Reply-To", "Sender", NULL);
        gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
-       header_addr_entry = GTK_BIN(header_addr_combo)->child;
+       header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
        gtk_widget_set_size_request(header_addr_combo, 150, -1);
        
        match_label2 = gtk_label_new("");
@@ -695,17 +704,15 @@ static void prefs_matcher_create(void)
        hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
        gtk_size_group_add_widget(size_group, hbox);
        PACK_CHECK_BUTTON(hbox, case_checkbtn, _("Case sensitive"));
+#ifndef G_OS_WIN32
        PACK_CHECK_BUTTON(hbox, regexp_checkbtn, _("Use regexp"));
+#endif
        gtk_box_pack_end(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
        gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 2, 3,
                         GTK_FILL, GTK_SHRINK, 4, 0);
 
        /* test info button */
-#if GTK_CHECK_VERSION(2, 8, 0)
        test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
-       test_btn = gtk_button_new_with_label(_("Info..."));
-#endif
        gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT (test_btn), "clicked",
                         G_CALLBACK(prefs_matcher_test_info),
@@ -811,7 +818,9 @@ static void prefs_matcher_create(void)
        matcher.addressbook_folder_combo = addressbook_folder_combo;
        matcher.match_combo = match_combo;
        matcher.case_checkbtn = case_checkbtn;
+#ifndef G_OS_WIN32
        matcher.regexp_checkbtn = regexp_checkbtn;
+#endif
        matcher.bool_op_combo = bool_op_combo;
        matcher.test_btn = test_btn;
        matcher.addressbook_select_btn = addressbook_select_btn;
@@ -874,8 +883,10 @@ static void prefs_matcher_reset_condition(void)
        gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), "");
        gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), "");
        gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), "");
-       gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), "");
+       gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), "");
+#ifndef G_OS_WIN32
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
 }
 
@@ -999,6 +1010,12 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_NOT_SPAM:
        case MATCHCRITERIA_SPAM:
                return CRITERIA_SPAM;
+       case MATCHCRITERIA_HAS_ATTACHMENT:
+       case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+               return CRITERIA_HAS_ATTACHMENT;
+       case MATCHCRITERIA_SIGNED:
+       case MATCHCRITERIA_NOT_SIGNED:
+               return CRITERIA_SIGNED;
        case MATCHCRITERIA_PARTIAL:
        case MATCHCRITERIA_NOT_PARTIAL:
                return CRITERIA_PARTIAL;
@@ -1109,6 +1126,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_LOCKED;
        case CRITERIA_SPAM:
                return MATCHCRITERIA_SPAM;
+       case CRITERIA_HAS_ATTACHMENT:
+               return MATCHCRITERIA_HAS_ATTACHMENT;
+       case CRITERIA_SIGNED:
+               return MATCHCRITERIA_SIGNED;
        case CRITERIA_PARTIAL:
                return MATCHCRITERIA_PARTIAL;
        case CRITERIA_COLORLABEL:
@@ -1197,6 +1218,10 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_LOCKED;
        case MATCHCRITERIA_SPAM:
                return MATCHCRITERIA_NOT_SPAM;
+       case MATCHCRITERIA_HAS_ATTACHMENT:
+               return MATCHCRITERIA_HAS_NO_ATTACHMENT;
+       case MATCHCRITERIA_SIGNED:
+               return MATCHCRITERIA_NOT_SIGNED;
        case MATCHCRITERIA_PARTIAL:
                return MATCHCRITERIA_NOT_PARTIAL;
        case MATCHCRITERIA_COLORLABEL:
@@ -1306,6 +1331,8 @@ static gint prefs_matcher_get_pred(const gint criteria)
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
        case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
        case CRITERIA_COLORLABEL:
                return gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo2));
        case CRITERIA_WATCH_THREAD:
@@ -1346,7 +1373,11 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        if(value_pred)
                criteria = prefs_matcher_not_criteria(criteria);
 
+#ifndef G_OS_WIN32
        use_regexp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn));
+#else
+       use_regexp = FALSE;
+#endif
        case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn));
 
        if (use_regexp) {
@@ -1376,6 +1407,8 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
        case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
        case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
        case CRITERIA_WATCH_THREAD:
@@ -1462,7 +1495,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
 
        case CRITERIA_FOUND_IN_ADDRESSBOOK:
                header = gtk_entry_get_text(GTK_ENTRY(matcher.header_addr_entry));
-               expr = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child));
+               expr = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
 
                if (*header == '\0') {
                    alertpanel_error(_("Header name is not set."));
@@ -1657,7 +1690,7 @@ static void prefs_matcher_down(void)
 
 static void prefs_matcher_enable_widget(GtkWidget* widget, const gboolean enable)
 {
-       g_return_if_fail(widget != NULL);
+       cm_return_if_fail(widget != NULL);
 
        if(enable == TRUE) {
                gtk_widget_set_sensitive(widget, TRUE);
@@ -1670,8 +1703,8 @@ static void prefs_matcher_enable_widget(GtkWidget* widget, const gboolean enable
 
 static void prefs_matcher_set_model(GtkWidget *widget, GtkTreeModel *model)
 {
-       g_return_if_fail(widget != NULL);
-       g_return_if_fail(model != NULL);
+       cm_return_if_fail(widget != NULL);
+       cm_return_if_fail(model != NULL);
        
        gtk_combo_box_set_model(GTK_COMBO_BOX(widget), model);
        gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
@@ -1710,15 +1743,19 @@ static void prefs_matcher_second_criteria_sel(GtkWidget *widget,
                        prefs_matcher_enable_widget(matcher.match_label2, TRUE);
                        prefs_matcher_enable_widget(matcher.string_entry, FALSE);
                        prefs_matcher_enable_widget(matcher.case_checkbtn, FALSE);
+#ifndef G_OS_WIN32
                        prefs_matcher_enable_widget(matcher.regexp_checkbtn, FALSE);
+#endif
                } else {
                        prefs_matcher_enable_widget(matcher.upper_filler, TRUE);
                        prefs_matcher_enable_widget(matcher.match_label2, FALSE);
                        prefs_matcher_enable_widget(matcher.string_entry, TRUE);
                        prefs_matcher_enable_widget(matcher.case_checkbtn, TRUE);
+#ifndef G_OS_WIN32
                        prefs_matcher_enable_widget(matcher.regexp_checkbtn, TRUE);
                        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
                                                matcher.regexp_checkbtn), FALSE);
+#endif
                        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
                                                matcher.case_checkbtn), FALSE);
                }
@@ -1789,8 +1826,10 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                                    MATCH_COMBO_IS_ENABLED(value));
        prefs_matcher_enable_widget(matcher.case_checkbtn,
                                    MATCH_CASE_REGEXP(value));
+#ifndef G_OS_WIN32
        prefs_matcher_enable_widget(matcher.regexp_checkbtn,
                                    MATCH_CASE_REGEXP(value));
+#endif
        prefs_matcher_enable_widget(matcher.test_btn,
                                    (value == MATCH_TEST));
        prefs_matcher_enable_widget(matcher.addressbook_select_btn,
@@ -1833,7 +1872,9 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
                gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Name:"));
                gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
                break;
        case MATCH_LABEL:
@@ -1850,7 +1891,9 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_phrase);
                prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
                gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("in"));
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
                prefs_matcher_second_criteria_sel(NULL, NULL);
                break;  
@@ -1914,6 +1957,7 @@ static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void prefs_matcher_cancel(void)
 {
        gtk_widget_hide(matcher.window);
+       gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
        inc_unlock();
 }
 
@@ -1968,6 +2012,7 @@ static void prefs_matcher_ok(void)
                }
                 g_free(str);
                gtk_widget_hide(matcher.window);
+               gtk_window_set_modal(GTK_WINDOW(matcher.window), FALSE);
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
@@ -2041,10 +2086,10 @@ static void prefs_matcher_addressbook_select(void)
        const gchar *folderpath = NULL;
        gchar *new_path = NULL;
 
-       folderpath = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child));
+       folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
        new_path = addressbook_folder_selection(folderpath);
        if (new_path) {
-               gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), new_path);
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), new_path);
                g_free(new_path);
        } 
 }
@@ -2096,6 +2141,7 @@ static GtkWidget *prefs_matcher_list_view_create(void)
        g_object_unref(model);  
        
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
        
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
@@ -2181,6 +2227,8 @@ static void prefs_matcher_set_criteria(const gint criteria)
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
        case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
                match_criteria = MATCH_FLAG;
                break;
        case CRITERIA_PARTIAL:
@@ -2268,6 +2316,8 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
        case MATCHCRITERIA_NOT_FORWARDED:
        case MATCHCRITERIA_NOT_LOCKED:
        case MATCHCRITERIA_NOT_SPAM:
+       case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+       case MATCHCRITERIA_NOT_SIGNED:
        case MATCHCRITERIA_NOT_PARTIAL:
        case MATCHCRITERIA_NOT_COLORLABEL:
        case MATCHCRITERIA_NOT_IGNORE_THREAD:
@@ -2346,7 +2396,7 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                        expr = prop->expr;
 
                gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), header);
-               gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), expr);
+               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), expr);
                break;
        }
 
@@ -2437,6 +2487,8 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
        case CRITERIA_SPAM:
+       case CRITERIA_HAS_ATTACHMENT:
+       case CRITERIA_SIGNED:
        case CRITERIA_COLORLABEL:
                gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
                                         negative_cond ? PREDICATE_FLAG_DISABLED :
@@ -2461,22 +2513,30 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
 
        switch(prop->matchtype) {
        case MATCHTYPE_MATCH:
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
                break;
 
        case MATCHTYPE_MATCHCASE:
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
                break;
 
        case MATCHTYPE_REGEXP:
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
                break;
 
        case MATCHTYPE_REGEXPCASE:
+#ifndef G_OS_WIN32
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
+#endif
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
                break;
        }
Claws Mail