#include "folder.h"
#include "filtering.h"
#include "selective_download.h"
+#include "log.h"
+#include "hooks.h"
static GList *inc_dialog_list = NULL;
static gint get_spool (FolderItem *dest,
const gchar *mbox);
-static void inc_spool_account(PrefsAccount *account);
-static void inc_all_spool(void);
+static gint inc_spool_account(PrefsAccount *account);
+static gint inc_all_spool(void);
static void inc_autocheck_timer_set_interval (guint interval);
static gint inc_autocheck_func (gpointer data);
folderview_unselect(mainwin->folderview);
folderview_select(mainwin->folderview, item);
}
- } else if (prefs_common.scan_all_after_inc) {
- item = mainwin->summaryview->folder_item;
- if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
- folder_update_item(item, TRUE);
- }
}
}
void inc_mail(MainWindow *mainwin, gboolean notify)
{
gint new_msgs = 0;
+ gint account_new_msgs = 0;
if (inc_lock_count) return;
return;
}
- if (prefs_common.inc_local)
- new_msgs = inc_spool();
-
- if (new_msgs <= 0)
- new_msgs = 1;
+ if (prefs_common.inc_local) {
+ account_new_msgs = inc_spool();
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
+ }
} else {
if (prefs_common.inc_local) {
- new_msgs = inc_spool();
- if (new_msgs < 0)
- new_msgs = 0;
+ account_new_msgs = inc_spool();
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
}
cur_account->session = STYPE_NORMAL;
- new_msgs += inc_account_mail(cur_account, mainwin);
+ account_new_msgs = inc_account_mail(cur_account, mainwin);
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
}
inc_finished(mainwin, new_msgs > 0);
IncProgressDialog *inc_dialog;
IncSession *session;
gchar *text[3];
- FolderItem *item;
+ FolderItem *item = NULL;
if(mainwin && mainwin->summaryview)
item = mainwin->summaryview->folder_item;
switch (account->protocol) {
case A_IMAP4:
case A_NNTP:
- folderview_check_new(FOLDER(account->folder));
- if (!prefs_common.scan_all_after_inc && item != NULL &&
- FOLDER(account->folder) == item->folder)
- folder_update_item(item, TRUE);
- return 1;
+ return folderview_check_new(FOLDER(account->folder));
case A_POP3:
case A_APOP:
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
if (mainwin) {
- toolbar_set_sensitive(mainwin);
+ toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
}
return inc_start(inc_dialog);
case A_LOCAL:
- inc_spool_account(account);
- return 1;
+ return inc_spool_account(account);
default:
break;
GList *list, *queue_list = NULL;
IncProgressDialog *inc_dialog;
gint new_msgs = 0;
+ gint account_new_msgs = 0;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
main_window_lock(mainwin);
if (prefs_common.inc_local) {
- new_msgs = inc_spool();
- if (new_msgs < 0)
- new_msgs = 0;
+ account_new_msgs = inc_spool();
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
}
list = account_get_list();
}
/* check local folders */
- inc_all_spool();
+ account_new_msgs = inc_all_spool();
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
/* check IMAP4 folders */
for (; list != NULL; list = list->next) {
account->protocol == A_NNTP) && account->recv_at_getall) {
FolderItem *item = mainwin->summaryview->folder_item;
- folderview_check_new(FOLDER(account->folder));
- if (!prefs_common.scan_all_after_inc && item != NULL &&
- FOLDER(account->folder) == item->folder)
- folder_update_item(item, TRUE);
+ new_msgs += folderview_check_new(FOLDER(account->folder));
}
}
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
}
- toolbar_set_sensitive(mainwin);
+ toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
- new_msgs += inc_start(inc_dialog);
-
+ new_msgs = inc_start(inc_dialog);
inc_finished(mainwin, new_msgs > 0);
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
gint new_msgs = 0;
gchar *msg;
gchar *fin_msg;
+ FolderItem *processing, *inbox;
+ MsgInfo *msginfo;
+ GSList *msglist, *msglist_element;
while (inc_dialog->queue_list != NULL) {
session = inc_dialog->queue_list->data;
}
}
- statusbar_pop_all();
-
/* CLAWS: perform filtering actions on dropped message */
- if (global_processing != NULL) {
- FolderItem *processing, *inbox;
- MsgInfo *msginfo;
- GSList *msglist, *msglist_element;
-
- /* CLAWS: get default inbox (perhaps per account) */
- if (pop3_state->ac_prefs->inbox) {
- /* CLAWS: get destination folder / mailbox */
- inbox = folder_find_item_from_identifier(pop3_state->ac_prefs->inbox);
- if (!inbox)
- inbox = folder_get_default_inbox();
- } else
+ /* CLAWS: get default inbox (perhaps per account) */
+ if (pop3_state->ac_prefs->inbox) {
+ /* CLAWS: get destination folder / mailbox */
+ inbox = folder_find_item_from_identifier(pop3_state->ac_prefs->inbox);
+ if (!inbox)
inbox = folder_get_default_inbox();
+ } else
+ inbox = folder_get_default_inbox();
- /* get list of messages in processing */
- processing = folder_get_default_processing();
- folder_item_scan(processing);
- msglist = folder_item_get_msg_list(processing);
+ /* get list of messages in processing */
+ processing = folder_get_default_processing();
+ folder_item_scan(processing);
+ msglist = folder_item_get_msg_list(processing);
- /* process messages */
- for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
- msginfo = (MsgInfo *) msglist_element->data;
+ folder_item_update_freeze();
+
+ /* process messages */
+ for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
+ MailFilteringData mail_filtering_data;
+ msginfo = (MsgInfo *) msglist_element->data;
+
+ mail_filtering_data.msginfo = msginfo;
+
+ if (!hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data)) {
/* filter if enabled in prefs or move to inbox if not */
- if(pop3_state->ac_prefs->filter_on_recv) {
+ if(global_processing && pop3_state->ac_prefs->filter_on_recv) {
filter_message_by_msginfo_with_inbox(global_processing, msginfo,
inbox);
} else {
folder_item_move_msg(inbox, msginfo);
}
- procmsg_msginfo_free(msginfo);
}
- g_slist_free(msglist);
+ procmsg_msginfo_free(msginfo);
}
+ g_slist_free(msglist);
+ folder_item_update_thaw();
- new_msgs += pop3_state->cur_total_num;
- if (!prefs_common.scan_all_after_inc) {
- folder_update_items_when_required
- (!prefs_common.open_inbox_on_inc);
- }
+ new_msgs += pop3_state->cur_total_num;
if (pop3_state->error_val == PS_AUTHFAIL &&
pop3_state->ac_prefs->tmp_pass) {
if (inc_state != INC_SUCCESS && inc_state != INC_CANCEL) {
error_num++;
- if (inc_state == INC_NO_SPACE ||
- inc_state == INC_IO_ERROR) {
+ if (inc_state == INC_ERROR ||
+ inc_state == INC_NO_SPACE ||
+ inc_state == INC_IO_ERROR ||
+ inc_state == INC_SOCKET_ERROR) {
inc_put_error(inc_state);
break;
}
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
NULL, NULL);
- alertpanel_error(_("Some errors occurred while getting mail."));
+ alertpanel_error_log(_("Some errors occurred while getting mail."));
if (inc_dialog->show_dialog)
manage_window_focus_out(inc_dialog->dialog->window,
NULL, NULL);
gchar *buf;
static AtmHandler handlers[] = {
pop3_greeting_recv ,
-#if USE_SSL
+#if USE_OPENSSL
pop3_stls_send , pop3_stls_recv,
#endif
pop3_getauth_user_send , pop3_getauth_user_recv,
for (i = POP3_GREETING_RECV; i < N_POP3_PHASE; i++)
atm->state[i].handler = handlers[i];
- atm->state[POP3_GREETING_RECV].condition = GDK_INPUT_READ;
+ atm->state[POP3_GREETING_RECV].condition = (G_IO_IN | G_IO_HUP | G_IO_ERR);
for (i = POP3_GREETING_RECV + 1; i < N_POP3_PHASE; ) {
- atm->state[i++].condition = GDK_INPUT_WRITE;
- atm->state[i++].condition = GDK_INPUT_READ;
+ atm->state[i++].condition = (G_IO_OUT | G_IO_ERR);
+ atm->state[i++].condition = (G_IO_IN | G_IO_HUP | G_IO_ERR);
}
atm->terminate = (AtmHandler)pop3_automaton_terminate;
atm->num = POP3_GREETING_RECV;
server = pop3_state->ac_prefs->recv_server;
-#if USE_SSL
+#if USE_OPENSSL
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport :
pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
progress_dialog_set_label(inc_dialog->dialog, buf);
g_free(buf);
GTK_EVENTS_FLUSH();
- statusbar_pop_all();
if ((sockinfo = sock_connect(server, port)) == NULL) {
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
return INC_CONNECT_ERROR;
}
-#if USE_SSL
+#if USE_OPENSSL
if (pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL &&
!ssl_init_socket(sockinfo)) {
pop3_automaton_terminate(sockinfo, atm);
pop3_state->sockinfo = sockinfo;
atm->help_sock = sockinfo;
- log_verbosity_set(TRUE);
+ statusbar_verbosity_set(TRUE);
/* oha: this messes up inc_progress update:
disabling this would avoid the label "Retrieve Header"
being overwritten by "Retrieve Message"
*/
recv_set_ui_func(inc_pop3_recv_func, session);
- atm->tag = sock_gdk_input_add(sockinfo,
- atm->state[atm->num].condition,
- automaton_input_cb, atm);
+ atm->tag = sock_input_add(sockinfo,
+ atm->state[atm->num].condition,
+ automaton_input_cb, atm);
while (!atm->terminated && !atm->cancelled)
gtk_main_iteration();
if (!atm->terminated)
pop3_automaton_terminate(sockinfo, atm);
- log_verbosity_set(FALSE);
+ statusbar_verbosity_set(FALSE);
/* oha: see above */
recv_set_ui_func(NULL, NULL);
return msgs;
}
-static void inc_spool_account(PrefsAccount *account)
+static gint inc_spool_account(PrefsAccount *account)
{
FolderItem *inbox;
} else
inbox = folder_get_default_inbox();
- get_spool(inbox, account->local_mbox);
+ return get_spool(inbox, account->local_mbox);
}
-static void inc_all_spool(void)
+static gint inc_all_spool(void)
{
GList *list = NULL;
+ gint new_msgs = 0;
+ gint account_new_msgs = 0;
list = account_get_list();
- if (!list) return;
+ if (!list) return 0;
for (; list != NULL; list = list->next) {
PrefsAccount *account = list->data;
if ((account->protocol == A_LOCAL) &&
- (account->recv_at_getall))
- inc_spool_account(account);
+ (account->recv_at_getall)) {
+ account_new_msgs = inc_spool_account(account);
+ if (account_new_msgs > 0)
+ new_msgs += account_new_msgs;
+ }
}
+
+ return new_msgs;
}
static gint get_spool(FolderItem *dest, const gchar *mbox)
if (msgs >= 0) empty_mbox(mbox);
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
- if (!prefs_common.scan_all_after_inc) {
- folder_update_items_when_required
- (!prefs_common.open_inbox_on_inc);
- } else if (!prefs_common.scan_all_after_inc) {
- folder_update_item(dest, TRUE);
- }
-
return msgs;
}
projects / claws.git / blobdiff