commit 00d923040e6130fc9023edad3cba690bcc93ad9f
parent 10104c627c056f4d1780e6bb5dd180e45d36599c
Author: Oliver Lowe <o@olowe.co>
Date: Sat, 23 Aug 2025 23:43:43 +1000
Remove more leftover filter configuration
Diffstat:
6 files changed, 1 insertion(+), 167 deletions(-)
diff --git a/src/account.c b/src/account.c
@@ -954,8 +954,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(msg_leave_hour);
ACP_FASSIGN(recv_at_getall);
ACP_FASSIGN(sd_rmmail_on_download);
- ACP_FASSIGN(filter_on_recv);
- ACP_FASSIGN(filterhook_on_recv);
ACP_FDUP(inbox);
ACP_FDUP(local_inbox);
ACP_FASSIGN(max_articles);
diff --git a/src/inc.c b/src/inc.c
@@ -755,10 +755,6 @@ static gint inc_start(IncProgressDialog *inc_dialog)
/* process messages */
folder_item_update_freeze();
- procmsg_msglist_filter(msglist, pop3_session->ac_prefs,
- &filtered, &unfiltered,
- pop3_session->ac_prefs->filter_on_recv);
-
if (unfiltered != NULL)
folder_item_move_msgs(inbox, unfiltered);
@@ -1429,7 +1425,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account
debug_print("Getting new messages from %s into %s...\n",
mbox, dest->path);
- msgs = proc_mbox(dest, tmp_mbox, account->filter_on_recv, account);
+ msgs = proc_mbox(dest, tmp_mbox, FALSE, account);
unlink(tmp_mbox);
if (msgs >= 0) empty_mbox(mbox);
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -166,8 +166,6 @@ typedef struct ReceivePage
GtkWidget *local_inbox_entry;
GtkWidget *local_inbox_btn;
- GtkWidget *filter_on_recv_checkbtn;
- GtkWidget *filterhook_on_recv_checkbtn;
GtkWidget *recvatgetall_checkbtn;
GtkWidget *imap_frame;
@@ -440,7 +438,6 @@ static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
static void prefs_account_nntpauth_toggled(GtkToggleButton *button, gpointer user_data);
static void prefs_account_mailcmd_toggled(GtkToggleButton *button, gpointer user_data);
static void prefs_account_showpwd_toggled(GtkEntry *entry, gpointer user_data);
-static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button, gpointer user_data);
static gchar *privacy_prefs;
@@ -528,14 +525,6 @@ static PrefParam receive_param[] = {
&receive_page.leave_hour_spinbtn,
prefs_set_data_from_spinbtn, prefs_set_spinbtn},
- {"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
- &receive_page.filter_on_recv_checkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
- {"filterhook_on_receive", "TRUE", &tmp_ac_prefs.filterhook_on_recv, P_BOOL,
- &receive_page.filterhook_on_recv_checkbtn,
- prefs_set_data_from_toggle, prefs_set_toggle},
-
{"imap_auth_method", "0", &tmp_ac_prefs.imap_auth_type, P_ENUM,
&receive_page.imap_auth_type_optmenu,
prefs_account_imap_auth_type_set_data_from_optmenu,
@@ -1453,8 +1442,6 @@ static void receive_create_widget_func(PrefsPage * _page,
GtkWidget *leave_hour_label;
GtkWidget *leave_hour_spinbtn;
GtkWidget *label;
- GtkWidget *filter_on_recv_checkbtn;
- GtkWidget *filterhook_on_recv_checkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
@@ -1775,12 +1762,6 @@ static void receive_create_widget_func(PrefsPage * _page,
SET_TOGGLE_SENSITIVITY(autochk_checkbtn, autochk_min_label);
SET_TOGGLE_SENSITIVITY(autochk_checkbtn, autochk_sec_label);
- PACK_CHECK_BUTTON (vbox1, filter_on_recv_checkbtn,
- _("Filter messages on receiving"));
-
- g_signal_connect(G_OBJECT(filter_on_recv_checkbtn), "toggled",
- G_CALLBACK(prefs_account_filter_on_recv_toggled),
- NULL);
g_signal_connect(G_OBJECT(autochk_hour_spinbtn), "value-changed",
G_CALLBACK(prefs_account_receive_itv_spinbutton_value_changed_cb),
(gpointer) page);
@@ -1791,9 +1772,6 @@ static void receive_create_widget_func(PrefsPage * _page,
G_CALLBACK(prefs_account_receive_itv_spinbutton_value_changed_cb),
(gpointer) page);
- PACK_CHECK_BUTTON (vbox1, filterhook_on_recv_checkbtn,
- _("Allow filtering using plugins on receiving"));
-
PACK_CHECK_BUTTON
(vbox1, recvatgetall_checkbtn,
_("'Get Mail' checks for new messages on this account"));
@@ -1804,8 +1782,6 @@ static void receive_create_widget_func(PrefsPage * _page,
page->rmmail_checkbtn = rmmail_checkbtn;
page->leave_time_spinbtn = leave_time_spinbtn;
page->leave_hour_spinbtn = leave_hour_spinbtn;
- page->filter_on_recv_checkbtn = filter_on_recv_checkbtn;
- page->filterhook_on_recv_checkbtn = filterhook_on_recv_checkbtn;
page->inbox_label = inbox_label;
page->inbox_entry = inbox_entry;
page->inbox_btn = inbox_btn;
@@ -5200,9 +5176,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
gtk_widget_show(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.filter_on_recv_checkbtn, TRUE);
- prefs_account_filter_on_recv_toggled
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), NULL);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
/* update pop_before_smtp sensitivity */
gtk_toggle_button_set_active
@@ -5212,12 +5185,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
FALSE);
}
@@ -5275,9 +5242,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_show(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
gtk_widget_hide(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.filter_on_recv_checkbtn, TRUE);
- prefs_account_filter_on_recv_toggled
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), NULL);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic_page.mailcmd_checkbtn), NULL);
@@ -5290,12 +5254,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
TRUE);
}
@@ -5358,9 +5316,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
gtk_widget_hide(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.filter_on_recv_checkbtn, TRUE);
- prefs_account_filter_on_recv_toggled
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), NULL);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_label, TRUE);
@@ -5373,12 +5328,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
FALSE);
}
@@ -5440,9 +5389,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.local_frame);
gtk_widget_hide(receive_page.autochk_frame);
gtk_widget_hide(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.filter_on_recv_checkbtn, FALSE);
- prefs_account_filter_on_recv_toggled
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), NULL);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, FALSE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
@@ -5453,10 +5399,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
pop_bfr_smtp_tm_set_sens(NULL, NULL);
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), FALSE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn), FALSE);
- gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
#ifdef USE_GNUTLS
@@ -5518,9 +5460,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
gtk_widget_hide(receive_page.local_frame);
gtk_widget_show(receive_page.autochk_frame);
gtk_widget_hide(receive_page.frame_maxarticle);
- gtk_widget_set_sensitive(receive_page.filter_on_recv_checkbtn, TRUE);
- prefs_account_filter_on_recv_toggled
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn), NULL);
gtk_widget_set_sensitive(receive_page.recvatgetall_checkbtn, TRUE);
gtk_widget_set_sensitive(basic_page.smtpserv_entry, TRUE);
@@ -5532,12 +5471,6 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
if (!tmp_ac_prefs.account_name) {
gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filter_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(receive_page.filterhook_on_recv_checkbtn),
- TRUE);
- gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn),
TRUE);
}
@@ -5618,15 +5551,6 @@ static void prefs_account_showpwd_toggled(GtkEntry *entry,
}
}
-static void prefs_account_filter_on_recv_toggled(GtkToggleButton *button,
- gpointer user_data)
-{
- gboolean do_filter;
-
- do_filter = gtk_toggle_button_get_active (button);
- gtk_widget_set_sensitive(receive_page.filterhook_on_recv_checkbtn, do_filter);
-}
-
gchar *prefs_account_generate_msgid(PrefsAccount *account)
{
gchar *addr, *tmbuf, *buf = NULL;
diff --git a/src/prefs_account.h b/src/prefs_account.h
@@ -104,8 +104,6 @@ struct _PrefsAccount
gint msg_leave_hour;
gboolean recv_at_getall;
gboolean sd_rmmail_on_download;
- gboolean filter_on_recv;
- gboolean filterhook_on_recv;
gchar *inbox;
gchar *local_inbox;
gint max_articles;
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -2028,83 +2028,6 @@ void procmsg_msginfo_set_to_folder(MsgInfo *msginfo, FolderItem *to_folder)
}
}
-void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
- GSList **filtered, GSList **unfiltered,
- gboolean do_filter)
-{
- GSList *cur, *to_do = NULL;
- gint total = 0, curnum = 0;
- MailFilteringData mail_filtering_data;
-
- cm_return_if_fail(filtered != NULL);
- cm_return_if_fail(unfiltered != NULL);
-
- *filtered = NULL;
- *unfiltered = NULL;
-
- if (list == NULL)
- return;
-
- total = g_slist_length(list);
-
- if (!do_filter) {
- *filtered = NULL;
- *unfiltered = g_slist_copy(list);
- return;
- }
-
- statusbar_print_all(_("Filtering messages...\n"));
-
- mail_filtering_data.msginfo = NULL;
- mail_filtering_data.msglist = list;
- mail_filtering_data.filtered = NULL;
- mail_filtering_data.unfiltered = NULL;
- mail_filtering_data.account = ac;
-
- if (!ac || ac->filterhook_on_recv)
- hooks_invoke(MAIL_LISTFILTERING_HOOKLIST, &mail_filtering_data);
-
- if (mail_filtering_data.filtered == NULL &&
- mail_filtering_data.unfiltered == NULL) {
- /* nothing happened */
- debug_print(MAIL_LISTFILTERING_HOOKLIST " did nothing. filtering whole list normally.\n");
- to_do = list;
- }
- if (mail_filtering_data.filtered != NULL) {
- /* keep track of what's been filtered by the hooks */
- debug_print(MAIL_LISTFILTERING_HOOKLIST " filtered some stuff. total %d filtered %d unfilt %d.\n",
- g_slist_length(list),
- g_slist_length(mail_filtering_data.filtered),
- g_slist_length(mail_filtering_data.unfiltered));
-
- *filtered = g_slist_copy(mail_filtering_data.filtered);
- }
- if (mail_filtering_data.unfiltered != NULL) {
- /* what the hooks didn't handle will go in filtered or
- * unfiltered in the next loop */
- debug_print(MAIL_LISTFILTERING_HOOKLIST " left unfiltered stuff. total %d filtered %d unfilt %d.\n",
- g_slist_length(list),
- g_slist_length(mail_filtering_data.filtered),
- g_slist_length(mail_filtering_data.unfiltered));
- to_do = mail_filtering_data.unfiltered;
- }
-
- for (cur = to_do; cur; cur = cur->next) {
- MsgInfo *info = (MsgInfo *)cur->data;
- *unfiltered = g_slist_prepend(*unfiltered, info);
- statusbar_progress_all(curnum++, total, prefs_common.statusbar_update_step);
- }
-
- g_slist_free(mail_filtering_data.filtered);
- g_slist_free(mail_filtering_data.unfiltered);
-
- *filtered = g_slist_reverse(*filtered);
- *unfiltered = g_slist_reverse(*unfiltered);
-
- statusbar_progress_all(0,0,0);
- statusbar_pop_all();
-}
-
MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
{
MsgInfo *tmp_msginfo = NULL;
diff --git a/src/procmsg.h b/src/procmsg.h
@@ -370,11 +370,6 @@ gboolean procmsg_msg_has_flagged_parent (MsgInfo *info,
gboolean procmsg_msg_has_marked_parent (MsgInfo *info);
void procmsg_msginfo_set_to_folder (MsgInfo *msginfo,
FolderItem *to_folder);
-void procmsg_msglist_filter (GSList *list,
- PrefsAccount *ac,
- GSList **filtered,
- GSList **unfiltered,
- gboolean do_filter);
MsgInfo *procmsg_msginfo_new_from_mimeinfo
(MsgInfo *src_msginfo,
