/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and
+ * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkutils.h>
+#include "gtk/gtkutils.h"
#include "common/claws.h"
#include "common/version.h"
#include "bogofilter.h"
#include "menu.h"
#include "addressbook.h"
+#include "combobox.h"
struct BogofilterPage
{
GtkWidget *bogopath;
GtkWidget *whitelist_ab;
GtkWidget *whitelist_ab_folder_combo;
-};
-
-/*!
- *\brief Preset addressbook book/folder items
- */
-static const gchar *whitelist_ab_folder_text [] = {
- N_("Any")
+ GtkWidget *learn_from_whitelist_chkbtn;
+ GtkWidget *mark_as_read;
};
static void foldersel_cb(GtkWidget *widget, gpointer data)
gchar *item_id;
gint newpos = 0;
- item = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL);
+ item = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE, NULL);
if (item && (item_id = folder_item_get_identifier(item)) != NULL) {
gtk_editable_delete_text(GTK_EDITABLE(entry), 0, -1);
gtk_editable_insert_text(GTK_EDITABLE(entry), item_id, strlen(item_id), &newpos);
}
}
+static void spam_handle_combobox_callback(GtkWidget *widget, gpointer user_data)
+{
+ GtkWidget *hbox = GTK_WIDGET(user_data);
+
+ if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) == 1) {
+ gtk_widget_set_sensitive(hbox, TRUE);
+ } else {
+ gtk_widget_set_sensitive(hbox, FALSE);
+ }
+}
+
+#ifndef USE_ALT_ADDRBOOK
static void bogofilter_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
{
struct BogofilterPage *page = (struct BogofilterPage *) data;
- gchar *folderpath = NULL;
- gboolean ret = FALSE;
-
- folderpath = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(page->whitelist_ab_folder_combo)->entry));
- ret = addressbook_folder_selection(&folderpath);
- if ( ret != FALSE && folderpath != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(page->whitelist_ab_folder_combo)->entry), folderpath);
+ const gchar *folderpath = NULL;
+ gchar *new_path = NULL;
+
+ folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))));
+ new_path = addressbook_folder_selection(folderpath);
+ if (new_path) {
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), new_path);
+ g_free(new_path);
+ }
}
+#endif
static void bogofilter_create_widget_func(PrefsPage * _page,
GtkWindow * window,
GtkWidget *hbox_max_size;
GtkWidget *hbox_process_emails, *hbox_save_spam, *hbox_save_unsure;
GtkWidget *hbox_bogopath, *hbox_whitelist;
+ GtkWidget *hbox_mark_as_read;
GtkWidget *max_size_label;
- GtkObject *max_size_spinbtn_adj;
+ GtkAdjustment *max_size_spinbtn_adj;
GtkWidget *max_size_spinbtn;
GtkWidget *max_size_kb_label;
GtkWidget *process_emails_checkbtn;
- GtkWidget *save_spam_checkbtn;
+ GtkWidget *spam_handle_combobox;
GtkWidget *save_spam_folder_entry;
GtkWidget *save_spam_folder_select;
GtkWidget *insert_header_checkbtn;
GtkWidget *whitelist_ab_checkbtn;
+ GtkWidget *learn_from_whitelist_chkbtn;
GtkWidget *bogopath_label;
GtkWidget *bogopath_entry;
- GtkTooltips *tooltips;
+ GtkWidget *mark_as_read_checkbtn;
GtkWidget *whitelist_ab_folder_combo;
GtkWidget *whitelist_ab_select_btn;
- GList *combo_items;
- gint i;
-
- tooltips = gtk_tooltips_new();
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show(max_size_label);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
- max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 10);
+ max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, 10000, 10, 10, 0));
max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
gtk_widget_show(max_size_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, max_size_spinbtn,
- _("Messages larger than this will not be checked"), NULL);
+ CLAWS_SET_TIP(max_size_spinbtn,
+ _("Messages larger than this will not be checked"));
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
- max_size_kb_label = gtk_label_new(_("kB"));
+ max_size_kb_label = gtk_label_new(_("KB"));
gtk_widget_show(max_size_kb_label);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
gtk_widget_show(hbox_save_spam);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_spam, TRUE, TRUE, 0);
- save_spam_checkbtn = gtk_check_button_new_with_label(_("Save spam in"));
- gtk_widget_show(save_spam_checkbtn);
- gtk_box_pack_start(GTK_BOX(hbox_save_spam), save_spam_checkbtn, FALSE, FALSE, 0);
+#if !GTK_CHECK_VERSION(2, 24, 0)
+ spam_handle_combobox = gtk_combo_box_new_text();
+#else
+ spam_handle_combobox = gtk_combo_box_text_new();
+#endif
+
+#if !GTK_CHECK_VERSION(2, 24, 0)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(spam_handle_combobox),
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(spam_handle_combobox),
+#endif
+ _("Delete spam"));
+
+#if !GTK_CHECK_VERSION(2, 24, 0)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(spam_handle_combobox),
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(spam_handle_combobox),
+#endif
+ _("Save spam in..."));
+
+#if !GTK_CHECK_VERSION(2, 24, 0)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(spam_handle_combobox),
+#else
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(spam_handle_combobox),
+#endif
+ _("Only mark as spam"));
+
+ gtk_widget_show(spam_handle_combobox);
+ gtk_box_pack_start(GTK_BOX(hbox_save_spam), spam_handle_combobox, FALSE, FALSE, 0);
+
+ GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox);
+ gtk_box_pack_start (GTK_BOX (hbox_save_spam), hbox, TRUE, TRUE, 0);
save_spam_folder_entry = gtk_entry_new();
gtk_widget_show (save_spam_folder_entry);
- gtk_box_pack_start (GTK_BOX (hbox_save_spam), save_spam_folder_entry, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(tooltips, save_spam_folder_entry,
- _("Folder for storing identified spam. Leave empty to use the trash folder."),
- NULL);
+ gtk_box_pack_start (GTK_BOX (hbox), save_spam_folder_entry, TRUE, TRUE, 0);
+ CLAWS_SET_TIP(save_spam_folder_entry,
+ _("Folder for storing identified spam. Leave empty to use the trash folder."));
save_spam_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_spam_folder_select);
- gtk_box_pack_start (GTK_BOX (hbox_save_spam), save_spam_folder_select, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, save_spam_folder_select,
- _("Click this button to select a folder for storing spam"),
- NULL);
+ gtk_box_pack_start (GTK_BOX (hbox), save_spam_folder_select, FALSE, FALSE, 0);
+ CLAWS_SET_TIP(save_spam_folder_select,
+ _("Click this button to select a folder for storing spam"));
+
+ g_signal_connect(G_OBJECT(spam_handle_combobox), "changed",
+ G_CALLBACK(spam_handle_combobox_callback), (gpointer)hbox);
hbox_save_unsure = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_save_unsure);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_save_unsure, TRUE, TRUE, 0);
- save_unsure_checkbtn = gtk_check_button_new_with_label(_("When unsure, move in"));
+ save_unsure_checkbtn = gtk_check_button_new_with_label(_("When unsure, move to"));
gtk_widget_show(save_unsure_checkbtn);
gtk_box_pack_start(GTK_BOX(hbox_save_unsure), save_unsure_checkbtn, FALSE, FALSE, 0);
save_unsure_folder_entry = gtk_entry_new();
gtk_widget_show (save_unsure_folder_entry);
gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_entry, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(tooltips, save_unsure_folder_entry,
- _("Folder for storing mail for which spam status is Unsure. Leave empty to use the inbox folder."),
- NULL);
+ CLAWS_SET_TIP(save_unsure_folder_entry,
+ _("Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."));
save_unsure_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_unsure_folder_select);
gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_select, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, save_unsure_folder_select,
- _("Click this button to select a folder for storing Unsure mails."),
- NULL);
+ CLAWS_SET_TIP(save_unsure_folder_select,
+ _("Click this button to select a folder for storing Unsure mails."));
insert_header_checkbtn = gtk_check_button_new_with_label(_("Insert X-Bogosity header"));
gtk_widget_show(insert_header_checkbtn);
gtk_box_pack_start(GTK_BOX(vbox2), insert_header_checkbtn, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, insert_header_checkbtn,
- _("Only done for messages in MH folders"),
- NULL);
+ CLAWS_SET_TIP(insert_header_checkbtn,
+ _("Only done for messages in MH folders"));
hbox_whitelist = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_whitelist);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_whitelist, TRUE, TRUE, 0);
- whitelist_ab_checkbtn = gtk_check_button_new_with_label(_("Whitelist senders present in addressbook/folder"));
+ whitelist_ab_checkbtn = gtk_check_button_new_with_label(_("Whitelist senders found in address book/folder"));
gtk_widget_show(whitelist_ab_checkbtn);
gtk_box_pack_start(GTK_BOX(hbox_whitelist), whitelist_ab_checkbtn, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, whitelist_ab_checkbtn,
- _("Messages coming from your addressbook contacts will be received in the normal folder even if detected as spam"), NULL);
+ CLAWS_SET_TIP(whitelist_ab_checkbtn,
+ _("Messages coming from your address book contacts will be received in the normal folder even if detected as spam"));
- whitelist_ab_folder_combo = gtk_combo_new();
- gtk_widget_show(whitelist_ab_folder_combo);
+ whitelist_ab_folder_combo = combobox_text_new(TRUE, _("Any"), NULL);
gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
- gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(whitelist_ab_folder_combo)->entry),
- TRUE);
-
- combo_items = NULL;
- for (i = 0; i < (gint) (sizeof(whitelist_ab_folder_text) / sizeof(gchar *)); i++) {
- combo_items = g_list_append(combo_items,
- (gpointer) _(whitelist_ab_folder_text[i]));
- }
- gtk_combo_set_popdown_strings(GTK_COMBO(whitelist_ab_folder_combo), combo_items);
- g_list_free(combo_items);
-
gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
- whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
+ whitelist_ab_select_btn = gtk_button_new_with_label(_("Select..."));
gtk_widget_show (whitelist_ab_select_btn);
gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, whitelist_ab_select_btn,
- _("Click this button to select a book or folder in the addressbook"),
- NULL);
+ CLAWS_SET_TIP(whitelist_ab_select_btn,
+ _("Click this button to select a book or folder in the address book"));
+
+ learn_from_whitelist_chkbtn = gtk_check_button_new_with_label(_("Learn whitelisted emails as ham"));
+ CLAWS_SET_TIP(learn_from_whitelist_chkbtn,
+ _("If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
+ "learn it as ham."));
+ gtk_widget_show(learn_from_whitelist_chkbtn);
+ gtk_box_pack_start (GTK_BOX (vbox2), learn_from_whitelist_chkbtn, TRUE, TRUE, 0);
hbox_bogopath = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_bogopath);
bogopath_entry = gtk_entry_new();
gtk_widget_show(bogopath_entry);
gtk_box_pack_start(GTK_BOX(hbox_bogopath), bogopath_entry, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, bogopath_entry,
- _("Path to bogofilter executable"),
- NULL);
+ CLAWS_SET_TIP(bogopath_entry,
+ _("Path to bogofilter executable"));
+
+ hbox_mark_as_read = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox_mark_as_read);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox_mark_as_read, TRUE, TRUE, 0);
+
+ mark_as_read_checkbtn = gtk_check_button_new_with_label(_("Mark spam as read"));
+ gtk_widget_show(mark_as_read_checkbtn);
+ gtk_box_pack_start(GTK_BOX(hbox_mark_as_read), mark_as_read_checkbtn, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_entry);
- SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_select);
SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_entry);
SET_TOGGLE_SENSITIVITY(save_unsure_checkbtn, save_unsure_folder_select);
SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_folder_combo);
+#ifndef USE_ALT_ADDRBOOK
SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_select_btn);
+#endif
+ SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, learn_from_whitelist_chkbtn);
config = bogofilter_get_config();
G_CALLBACK(foldersel_cb), save_spam_folder_entry);
g_signal_connect(G_OBJECT(save_unsure_folder_select), "clicked",
G_CALLBACK(foldersel_cb), save_unsure_folder_entry);
+#ifndef USE_ALT_ADDRBOOK
g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
G_CALLBACK(bogofilter_whitelist_ab_select_cb), page);
-
+#else
+ gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);
+#endif
gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size_spinbtn), (float) config->max_size);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(process_emails_checkbtn), config->process_emails);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(save_spam_checkbtn), config->receive_spam);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(spam_handle_combobox), config->receive_spam);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(save_unsure_checkbtn), config->save_unsure);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(insert_header_checkbtn), config->insert_header);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(whitelist_ab_checkbtn), config->whitelist_ab);
- if (config->whitelist_ab_folder != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(whitelist_ab_folder_combo)->entry),
- config->whitelist_ab_folder);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(learn_from_whitelist_chkbtn), config->learn_from_whitelist);
+ if (config->whitelist_ab_folder != NULL) {
+ /* translate "Any" (stored UNtranslated) */
+ if (strcasecmp(config->whitelist_ab_folder, "Any") == 0)
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ config->whitelist_ab_folder);
+ else
+ /* backward compatibility (when translated "Any" was stored) */
+ if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ config->whitelist_ab_folder);
+ else
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ config->whitelist_ab_folder);
+ }
if (config->save_folder != NULL)
gtk_entry_set_text(GTK_ENTRY(save_spam_folder_entry), config->save_folder);
if (config->save_unsure_folder != NULL)
gtk_entry_set_text(GTK_ENTRY(save_unsure_folder_entry), config->save_unsure_folder);
if (config->bogopath != NULL)
gtk_entry_set_text(GTK_ENTRY(bogopath_entry), config->bogopath);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mark_as_read_checkbtn), config->mark_as_read);
page->max_size = max_size_spinbtn;
page->process_emails = process_emails_checkbtn;
- page->receive_spam = save_spam_checkbtn;
+ page->receive_spam = spam_handle_combobox;
page->save_folder = save_spam_folder_entry;
page->save_folder_select = save_spam_folder_select;
page->insert_header = insert_header_checkbtn;
page->whitelist_ab = whitelist_ab_checkbtn;
page->whitelist_ab_folder_combo = whitelist_ab_folder_combo;
+ page->learn_from_whitelist_chkbtn = learn_from_whitelist_chkbtn;
page->bogopath = bogopath_entry;
+ page->mark_as_read = mark_as_read_checkbtn;
+
page->page.widget = vbox1;
}
config->process_emails = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->process_emails));
/* receive_spam */
- config->receive_spam = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->receive_spam));
+ config->receive_spam = gtk_combo_box_get_active(GTK_COMBO_BOX(page->receive_spam));
/* save_folder */
g_free(config->save_folder);
config->whitelist_ab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->whitelist_ab));
g_free(config->whitelist_ab_folder);
config->whitelist_ab_folder = gtk_editable_get_chars(
- GTK_EDITABLE(GTK_COMBO(page->whitelist_ab_folder_combo)->entry), 0, -1);
+ GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ /* store UNtranslated "Any" */
+ if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
+ g_free(config->whitelist_ab_folder);
+ config->whitelist_ab_folder = g_strdup("Any");
+ }
+
+ /* learn_from_whitelist_chkbtn */
+ config->learn_from_whitelist = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->learn_from_whitelist_chkbtn));
/* bogopath */
g_free(config->bogopath);
/* max_size */
config->max_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->max_size));
+ /* mark_as_read */
+ config->mark_as_read = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->mark_as_read));
+
if (config->process_emails) {
bogofilter_register_hook();
} else {
BogoCbData *cbdata = (BogoCbData *)data;
if (cbdata->message)
- statusbar_print_all(cbdata->message);
+ statusbar_print_all("%s", cbdata->message);
else if (cbdata->total == 0) {
statusbar_pop_all();
}
projects / claws.git / blobdiff