+2007-05-03 [wwp] 2.9.1cvs40
+
+ * src/plugins/spamassassin/spamassassin.c
+ * src/plugins/spamassassin/spamassassin.h
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ * src/plugins/bogofilter/bogofilter.c
+ * src/plugins/bogofilter/bogofilter.h
+ * src/plugins/bogofilter/bogofilter_gtk.c
+ Added an option to conditionally mark saved spam
+ as read (default is and was to do so).
+ Satisfies feature request 1708539 on sf.net tracker.
+
2007-05-03 [colin] 2.9.1cvs39
* src/inc.c
( cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/grouplistdialog.c; ) > 2.9.1cvs37.patchset
( cvs diff -u -r 1.96.2.171 -r 1.96.2.172 src/textview.c; ) > 2.9.1cvs38.patchset
( cvs diff -u -r 1.149.2.72 -r 1.149.2.73 src/inc.c; ) > 2.9.1cvs39.patchset
+( cvs diff -u -r 1.18.2.51 -r 1.18.2.52 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.37 -r 1.23.2.38 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/bogofilter/bogofilter_gtk.c; ) > 2.9.1cvs40.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
NULL, NULL, NULL},
{"whitelist_ab_folder", "Any", &config.whitelist_ab_folder, P_STRING,
NULL, NULL, NULL},
+ {"mark_as_read", "TRUE", &config.mark_as_read, P_BOOL,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
for (cur = new_spams; cur; cur = cur->next) {
MsgInfo *msginfo = (MsgInfo *)cur->data;
if (config.receive_spam) {
- procmsg_msginfo_change_flags(msginfo, MSG_SPAM, 0, ~0, 0);
+ if (config.mark_as_read)
+ procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
} else {
folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
}
gchar *whitelist_ab_folder;
gboolean save_unsure;
gchar *save_unsure_folder;
+ gboolean mark_as_read;
};
BogofilterConfig *bogofilter_get_config (void);
GtkWidget *bogopath;
GtkWidget *whitelist_ab;
GtkWidget *whitelist_ab_folder_combo;
+ GtkWidget *mark_as_read;
};
/*!
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;
GtkWidget *bogopath_label;
GtkWidget *bogopath_entry;
+ GtkWidget *mark_as_read_checkbtn;
+
GtkTooltips *tooltips;
GtkWidget *whitelist_ab_folder_combo;
_("Path to bogofilter executable"),
NULL);
+ 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);
SET_TOGGLE_SENSITIVITY(whitelist_ab_checkbtn, whitelist_ab_select_btn);
+ SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, mark_as_read_checkbtn);
config = bogofilter_get_config();
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->whitelist_ab_folder_combo = whitelist_ab_folder_combo;
page->bogopath = bogopath_entry;
+ page->mark_as_read = mark_as_read_checkbtn;
+
page->page.widget = vbox1;
}
/* 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 {
NULL, NULL, NULL},
{"username", "", &config.username, P_STRING,
NULL, NULL, NULL},
+ {"mark_as_read", "TRUE", &config.mark_as_read, P_BOOL,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
save_folder = folder_get_default_trash();
}
}
- procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ if (config.mark_as_read)
+ procmsg_msginfo_unset_flags(msginfo, ~0, 0);
procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
msginfo->is_move = TRUE;
msginfo->to_filter_folder = save_folder;
guint max_size;
guint timeout;
gchar *username;
+ gboolean mark_as_read;
};
SpamAssassinConfig *spamassassin_get_config (void);
GtkWidget *save_folder_select;
GtkWidget *max_size;
GtkWidget *timeout;
+ GtkWidget *mark_as_read;
SpamAssassinTransport trans;
};
GtkWidget *frame_transport, *table_transport, *vbox_transport;
GtkWidget *hbox_spamd, *hbox_max_size, *hbox_timeout;
GtkWidget *hbox_process_emails, *hbox_save_spam;
+ GtkWidget *hbox_mark_as_read;
GtkWidget *enable_sa_checkbtn;
GtkWidget *save_spam_folder_entry;
GtkWidget *save_spam_folder_select;
+ GtkWidget *mark_as_read_checkbtn;
+
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new();
_("Click this button to select a folder for storing spam"),
NULL);
+ 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, TRUE, TRUE, 0);
+
SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, frame_transport);
SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, hbox_max_size);
SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, hbox_timeout);
SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_entry);
SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, save_spam_folder_select);
SET_TOGGLE_SENSITIVITY(enable_sa_checkbtn, hbox_process_emails);
+ SET_TOGGLE_SENSITIVITY(save_spam_checkbtn, mark_as_read_checkbtn);
config = spamassassin_get_config();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(save_spam_checkbtn), config->receive_spam);
if (config->save_folder != NULL)
gtk_entry_set_text(GTK_ENTRY(save_spam_folder_entry), config->save_folder);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mark_as_read_checkbtn), config->mark_as_read);
page->enable_sa_checkbtn = enable_sa_checkbtn;
page->transport_label = transport_label;
page->receive_spam = save_spam_checkbtn;
page->save_folder = save_spam_folder_entry;
page->save_folder_select = save_spam_folder_select;
+ page->mark_as_read = mark_as_read_checkbtn;
active = 0;
for (i = 0; i < (sizeof(transports) / sizeof(struct Transport)); i++) {
/* timeout */
config->timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->timeout));
+ /* mark_as_read */
+ config->mark_as_read = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->mark_as_read));
+
if (config->process_emails) {
spamassassin_register_hook();
} else {