#include <stdio.h>
#include <unistd.h>
#include <string.h>
+#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include "progressdialog.h"
#include "inputdialog.h"
#include "alertpanel.h"
-#include "filter.h"
#include "automaton.h"
#include "folder.h"
#include "filtering.h"
static IncSession *inc_session_new (PrefsAccount *account);
static void inc_session_destroy (IncSession *session);
-static Pop3State *inc_pop3_state_new (PrefsAccount *account);
-static void inc_pop3_state_destroy (Pop3State *state);
static gint inc_start (IncProgressDialog *inc_dialog);
static IncState inc_pop3_session_do (IncSession *session);
static gint pop3_automaton_terminate (SockInfo *source,
Automaton *atm);
-static GHashTable *inc_get_uidl_table (PrefsAccount *ac_prefs);
-static void inc_write_uidl_list (Pop3State *state);
-
static gboolean inc_pop3_recv_func (SockInfo *sock,
gint count,
gint read_bytes,
static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
+static gint inc_dialog_delete_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static gint inc_spool (void);
static gint get_spool (FolderItem *dest,
if (prefs_common.open_inbox_on_inc) {
item = cur_account && cur_account->inbox
- ? folder_find_item_from_path(cur_account->inbox)
+ ? folder_find_item_from_identifier(cur_account->inbox)
: folder_get_default_inbox();
if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
folderview_unselect(mainwin->folderview);
folderview_select(mainwin->folderview, item);
}
- } else {
+ } else if (prefs_common.scan_all_after_inc) {
item = mainwin->summaryview->folder_item;
if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
- folderview_unselect(mainwin->folderview);
- folderview_select(mainwin->folderview, item);
+ folder_update_item(item, TRUE);
}
}
}
if (inc_lock_count) return;
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
+
+ inc_lock();
inc_autocheck_timer_remove();
- summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
if (prefs_common.inc_local)
new_msgs = inc_spool();
+
+ if (new_msgs <= 0)
+ new_msgs = 1;
} else {
- if (prefs_common.inc_local)
+ if (prefs_common.inc_local) {
new_msgs = inc_spool();
-
+ if (new_msgs < 0)
+ new_msgs = 0;
+ }
+ cur_account->session = STYPE_NORMAL;
new_msgs += inc_account_mail(cur_account, mainwin);
}
main_window_unlock(mainwin);
inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
+ inc_unlock();
}
-gint inc_selective_download(MainWindow *mainwin, gint session_type)
+void inc_selective_download(MainWindow *mainwin, PrefsAccount *acc, gint session)
{
- PrefsAccount *account = cur_account;
- gint new_msgs = 0;
+ GSList *cur;
+ gint new_msgs = 0;
- account->session_type = session_type;
- new_msgs = inc_account_mail(account, mainwin);
- account->session_type = RETR_NORMAL;
+ acc->session = session;
+ inc_account_mail(acc, mainwin);
+ acc->session = STYPE_NORMAL;
- return new_msgs;
+ for (cur = acc->msg_list; cur != NULL; cur = cur->next) {
+ HeaderItems *items =(HeaderItems*)cur->data;
+
+ if (items->state == SD_DOWNLOADED &&
+ items->del_by_old_session == FALSE) {
+ new_msgs++;
+ }
+ }
+
+ if (new_msgs) {
+ inc_finished(mainwin, TRUE);
+ inc_notify_cmd(new_msgs, prefs_common.newmail_notify_manu);
+ }
+}
+
+void inc_pop_before_smtp(PrefsAccount *acc)
+{
+ acc->session = STYPE_POP_BEFORE_SMTP;
+ inc_account_mail(acc, NULL);
}
static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
IncProgressDialog *inc_dialog;
IncSession *session;
gchar *text[3];
+ 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;
case A_POP3:
text[2] = _("Standby");
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
- main_window_set_toolbar_sensitive(mainwin);
- main_window_set_menu_sensitive(mainwin);
-
+ if (mainwin) {
+ toolbar_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
+ }
+
return inc_start(inc_dialog);
case A_LOCAL:
inc_spool_account(account);
return 1;
+
+ default:
+ break;
}
+ return 0;
}
void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
GList *list, *queue_list = NULL;
IncProgressDialog *inc_dialog;
gint new_msgs = 0;
+
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
if (inc_lock_count) return;
inc_autocheck_timer_remove();
- summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
- if (prefs_common.inc_local)
+ if (prefs_common.inc_local) {
new_msgs = inc_spool();
+ if (new_msgs < 0)
+ new_msgs = 0;
+ }
list = account_get_list();
if (!list) {
for (; list != NULL; list = list->next) {
PrefsAccount *account = list->data;
if ((account->protocol == A_IMAP4 ||
- account->protocol == A_NNTP) && account->recv_at_getall)
+ 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);
+ }
}
/* check POP3 accounts */
for (list = account_get_list(); list != NULL; list = list->next) {
IncSession *session;
PrefsAccount *account = list->data;
- account->session_type = RETR_NORMAL;
+ account->session = STYPE_NORMAL;
if (account->recv_at_getall) {
session = inc_session_new(account);
if (session)
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
}
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
new_msgs += inc_start(inc_dialog);
gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
GTK_SIGNAL_FUNC(inc_cancel_cb), dialog);
gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
- GTK_SIGNAL_FUNC(gtk_true), NULL);
+ GTK_SIGNAL_FUNC(inc_dialog_delete_cb), dialog);
/* manage_window_set_transient(GTK_WINDOW(progress->window)); */
progress_dialog_set_value(progress, 0.0);
{
progress_dialog_set_value(inc_dialog->dialog, 0.0);
progress_dialog_set_label(inc_dialog->dialog, "");
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
}
static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
g_return_if_fail(inc_dialog != NULL);
inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
-
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
progress_dialog_destroy(inc_dialog->dialog);
g_free(inc_dialog);
return NULL;
session = g_new0(IncSession, 1);
- session->pop3_state = inc_pop3_state_new(account);
- session->pop3_state->session = session;
+ session->pop3_state = pop3_state_new(account);
+ session->pop3_state->data = session;
return session;
}
{
g_return_if_fail(session != NULL);
- inc_pop3_state_destroy(session->pop3_state);
+ pop3_state_destroy(session->pop3_state);
g_free(session);
}
-static Pop3State *inc_pop3_state_new(PrefsAccount *account)
-{
- Pop3State *state;
-
- state = g_new0(Pop3State, 1);
-
- state->ac_prefs = account;
- state->folder_table = g_hash_table_new(NULL, NULL);
- state->uidl_todelete_list = NULL;
- state->uidl_table = inc_get_uidl_table(account);
- state->inc_state = INC_SUCCESS;
-
- return state;
-}
-
-static void inc_pop3_state_destroy(Pop3State *state)
-{
- gint n;
-
- g_hash_table_destroy(state->folder_table);
-
- for (n = 1; n <= state->count; n++)
- g_free(state->msg[n].uidl);
- g_free(state->msg);
-
- if (state->uidl_table) {
- hash_free_strings(state->uidl_table);
- g_hash_table_destroy(state->uidl_table);
- }
- g_slist_free(state->uidl_todelete_list);
- g_free(state->greeting);
- g_free(state->user);
- g_free(state->pass);
- g_free(state->prev_folder);
-
- g_free(state);
-}
-
static gint inc_start(IncProgressDialog *inc_dialog)
{
IncSession *session;
gint num = 0;
gint error_num = 0;
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;
(pop3_state->ac_prefs->recv_server,
pop3_state->user);
- if (inc_dialog->show_dialog)
+ if (inc_dialog->mainwin && inc_dialog->show_dialog)
manage_window_focus_in
(inc_dialog->mainwin->window,
NULL, NULL);
/* begin POP3 session */
inc_state = inc_pop3_session_do(session);
- if (inc_state == INC_SUCCESS) {
+ switch (inc_state) {
+ case INC_SUCCESS:
+ if (pop3_state->cur_total_num > 0)
+ msg = g_strdup_printf
+ (_("Done (%d message(s) (%s) received)"),
+ pop3_state->cur_total_num,
+ to_human_readable(pop3_state->cur_total_recv_bytes));
+ else
+ msg = g_strdup_printf(_("Done (no new messages)"));
gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
- gtk_clist_set_text(clist, num, 2, _("Done"));
- } else if (inc_state == INC_CANCEL) {
+ gtk_clist_set_text(clist, num, 2, msg);
+ g_free(msg);
+ break;
+ case INC_CONNECT_ERROR:
+ gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
+ gtk_clist_set_text(clist, num, 2, _("Connection failed"));
+ break;
+ case INC_AUTH_FAILED:
+ gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
+ gtk_clist_set_text(clist, num, 2, _("Auth failed"));
+ break;
+ case INC_LOCKED:
+ gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
+ gtk_clist_set_text(clist, num, 2, _("Locked"));
+ break;
+ case INC_ERROR:
+ case INC_NO_SPACE:
+ case INC_IO_ERROR:
+ case INC_SOCKET_ERROR:
+ gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
+ gtk_clist_set_text(clist, num, 2, _("Error"));
+ break;
+ case INC_CANCEL:
gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
gtk_clist_set_text(clist, num, 2, _("Cancelled"));
- } else {
- gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
- if (inc_state == INC_CONNECT_ERROR)
- gtk_clist_set_text(clist, num, 2,
- _("Connection failed"));
- else if (inc_state == INC_AUTH_FAILED)
- gtk_clist_set_text(clist, num, 2,
- _("Auth failed"));
- else
- gtk_clist_set_text(clist, num, 2, _("Error"));
+ break;
+ default:
+ break;
}
-
+
if (pop3_state->error_val == PS_AUTHFAIL) {
- if(!prefs_common.noerrorpanel) {
+ if(!prefs_common.no_recv_err_panel) {
if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
((prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE) && focus_window)) {
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
statusbar_pop_all();
/* CLAWS: perform filtering actions on dropped message */
- if (global_processing != NULL) {
- FolderItem *processing, *inbox;
- Folder *folder;
- 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);
- folder = processing->folder;
- msglist = folder->get_msg_list(folder, processing, FALSE);
-
- /* process messages */
- for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
- msginfo = (MsgInfo *) msglist_element->data;
- /* filter if enabled in prefs or move to inbox if not */
- if(pop3_state->ac_prefs->filter_on_recv) {
- filter_message_by_msginfo_with_inbox(global_processing, msginfo,
- pop3_state->folder_table,
- inbox);
- } else {
- folder_item_move_msg(inbox, msginfo);
- g_hash_table_insert(pop3_state->folder_table, inbox,
- GINT_TO_POINTER(1));
- }
- procmsg_msginfo_free(msginfo);
+ /* 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;
+ /* filter if enabled in prefs or move to inbox if not */
+ 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);
}
- g_slist_free(msglist);
+ procmsg_msginfo_free(msginfo);
}
+ g_slist_free(msglist);
new_msgs += pop3_state->cur_total_num;
if (!prefs_common.scan_all_after_inc) {
- folder_item_scan_foreach(pop3_state->folder_table);
- folderview_update_item_foreach
- (pop3_state->folder_table);
+ folder_update_items_when_required
+ (!prefs_common.open_inbox_on_inc);
}
if (pop3_state->error_val == PS_AUTHFAIL &&
pop3_state->ac_prefs->tmp_pass = NULL;
}
- inc_write_uidl_list(pop3_state);
+ pop3_write_uidl_list(pop3_state);
if (inc_state != INC_SUCCESS && inc_state != INC_CANCEL) {
error_num++;
- if (inc_state == INC_NOSPACE) {
+ 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;
}
num++;
}
- if (error_num && !prefs_common.noerrorpanel) {
+ if (new_msgs > 0)
+ fin_msg = g_strdup_printf(_("Finished (%d new message(s))"),
+ new_msgs);
+ else
+ fin_msg = g_strdup_printf(_("Finished (no new messages)"));
+
+ progress_dialog_set_label(inc_dialog->dialog, fin_msg);
+
+ if (error_num && !prefs_common.no_recv_err_panel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
NULL, NULL);
- alertpanel_error(_("Some errors occured while getting mail."));
+ alertpanel_error(_("Some errors occurred while getting mail."));
if (inc_dialog->show_dialog)
manage_window_focus_out(inc_dialog->dialog->window,
NULL, NULL);
g_list_remove(inc_dialog->queue_list, session);
}
- inc_progress_dialog_destroy(inc_dialog);
+ if (prefs_common.close_recv_dialog)
+ inc_progress_dialog_destroy(inc_dialog);
+ else {
+ gtk_window_set_title(GTK_WINDOW(inc_dialog->dialog->window),
+ fin_msg);
+ gtk_label_set_text(GTK_LABEL(GTK_BIN(inc_dialog->dialog->cancel_btn)->child),
+ _("Close"));
+ }
+
+ g_free(fin_msg);
return new_msgs;
}
gchar *buf;
static AtmHandler handlers[] = {
pop3_greeting_recv ,
+#if USE_SSL
+ pop3_stls_send , pop3_stls_recv,
+#endif
pop3_getauth_user_send , pop3_getauth_user_recv,
pop3_getauth_pass_send , pop3_getauth_pass_recv,
pop3_getauth_apop_send , pop3_getauth_apop_recv,
pop3_logout_send , pop3_logout_recv
};
- debug_print(_("getting new messages of account %s...\n"),
+ debug_print("getting new messages of account %s...\n",
pop3_state->ac_prefs->account_name);
+ pop3_state->ac_prefs->last_pop_login_time = time(NULL);
atm = automaton_create(N_POP3_PHASE);
session->atm = atm;
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;
- for (i = POP3_GETAUTH_USER_SEND; i < N_POP3_PHASE; ) {
+ 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->terminate = (AtmHandler)pop3_automaton_terminate;
+ atm->ui_func = (AtmUIFunc)inc_progress_update;
atm->num = POP3_GREETING_RECV;
#if USE_SSL
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport :
- pop3_state->ac_prefs->ssl_pop ? 995 : 110;
+ pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
#else
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport : 110;
if ((sockinfo = sock_connect(server, port)) == NULL) {
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
server, port);
- if(!prefs_common.noerrorpanel) {
+ if(!prefs_common.no_recv_err_panel) {
if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
((prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE) && focus_window)) {
manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
}
pop3_automaton_terminate(NULL, atm);
automaton_destroy(atm);
+ session->inc_state = INC_CONNECT_ERROR;
return INC_CONNECT_ERROR;
}
#if USE_SSL
- if (pop3_state->ac_prefs->ssl_pop && !ssl_init_socket(sockinfo)) {
- pop3_automaton_terminate(NULL, atm);
+ if (pop3_state->ac_prefs->ssl_pop == SSL_TUNNEL &&
+ !ssl_init_socket(sockinfo)) {
+ pop3_automaton_terminate(sockinfo, atm);
automaton_destroy(atm);
+ session->inc_state = INC_CONNECT_ERROR;
return INC_CONNECT_ERROR;
}
#endif
atm->help_sock = sockinfo;
log_verbosity_set(TRUE);
+ /* oha: this messes up inc_progress update:
+ disabling this would avoid the label "Retrieve Header"
+ being overwritten by "Retrieve Message"
+ Setting inc_pop3_recv_func is not necessary
+ since atm already handles the progress dialog ui
+ just fine.
+ */
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);
- while (!atm->terminated)
+ while (!atm->terminated && !atm->cancelled)
gtk_main_iteration();
+ if (!atm->terminated)
+ pop3_automaton_terminate(sockinfo, atm);
+
log_verbosity_set(FALSE);
+ /* oha: see above */
recv_set_ui_func(NULL, NULL);
automaton_destroy(atm);
- return pop3_state->inc_state;
+ if (session->inc_state != INC_SUCCESS)
+ return session->inc_state;
+
+ switch (pop3_state->error_val) {
+ case PS_SUCCESS:
+ session->inc_state = INC_SUCCESS;
+ break;
+ case PS_AUTHFAIL:
+ session->inc_state = INC_AUTH_FAILED;
+ break;
+ case PS_IOERR:
+ session->inc_state = INC_IO_ERROR;
+ break;
+ case PS_SOCKET:
+ session->inc_state = INC_SOCKET_ERROR;
+ break;
+ case PS_LOCKBUSY:
+ session->inc_state = INC_LOCKED;
+ break;
+ default:
+ session->inc_state = INC_ERROR;
+ break;
+ }
+
+ return session->inc_state;
}
static gint pop3_automaton_terminate(SockInfo *source, Automaton *atm)
return 0;
}
-static GHashTable *inc_get_uidl_table(PrefsAccount *ac_prefs)
-{
- GHashTable *table;
- gchar *path;
- FILE *fp;
- gchar buf[IDLEN + 3];
- GDate curdate;
- gchar **data;
-
- path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "uidl-", ac_prefs->recv_server,
- "-", ac_prefs->userid, NULL);
-
- if ((fp = fopen(path, "rb")) == NULL) {
- if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
- g_free(path);
- return NULL;
- }
- g_free(path);
-
- table = g_hash_table_new(g_str_hash, g_str_equal);
-
- g_date_clear(&curdate, 1);
-
- /*
- * NOTE: g_date_set_time() has to be called inside this
- * loop, because a day change may happen??? That right?
- */
-
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- strretchomp(buf);
-
- /* data[0] will contain uidl
- * data[1] will contain day of retrieval */
-
- /*
- * FIXME: convoluted implementation. need to find
- * a better way to split the string.
- */
- if (strchr(buf, '\t')) {
- data = g_strsplit(buf, "\t", 2);
- if (data) {
- g_hash_table_insert(table, g_strdup(data[0]), g_strdup(data[1]));
- g_strfreev(data);
- }
- } else {
- g_date_set_time(&curdate, time(NULL));
- g_hash_table_insert(table, g_strdup(buf),
- g_strdup_printf("%d", g_date_day_of_year(&curdate)));
- }
- }
-
- fclose(fp);
- return table;
-}
-
-static void inc_write_uidl_list(Pop3State *state)
-{
- gchar *path;
- FILE *fp;
- gint n;
- GDate curdate;
- const char *sdate;
- int tdate;
-
- if (!state->uidl_is_valid)
- return;
-
- path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "uidl-", state->ac_prefs->recv_server,
- "-", state->user, NULL);
- if ((fp = fopen(path, "wb")) == NULL) {
- FILE_OP_ERROR(path, "fopen");
- g_free(path);
- return;
- }
-
- g_date_clear(&curdate, 1);
-
- for (n = 1; n <= state->count; n++) {
- if (state->msg[n].uidl && state->msg[n].received &&
- !state->msg[n].deleted) {
- if (fputs(state->msg[n].uidl, fp) == EOF) {
- FILE_OP_ERROR(path, "fputs");
- break;
- }
- if (fputc('\t', fp) == EOF) {
- FILE_OP_ERROR(path, "fputc");
- break;
- }
-
- /*
- * NOTE: need to set time to watch for day changes??
- */
- g_date_set_time(&curdate, time(NULL));
-
- if (NULL != (sdate = g_hash_table_lookup(state->uidl_table, state->msg[n].uidl))) {
- tdate = sdate != NULL ? atoi(sdate) : g_date_day_of_year(&curdate);
- if (fprintf(fp, "%3d", tdate) == EOF) {
- FILE_OP_ERROR(path, "fprintf");
- break;
- }
- } else {
- if (fprintf(fp, "%d", g_date_day_of_year(&curdate)) == EOF) {
- FILE_OP_ERROR(path, "fputs");
- break;
- }
- }
-
- if (fputc('\n', fp) == EOF) {
- FILE_OP_ERROR(path, "fputc");
- break;
- }
- }
- }
-
- if (fclose(fp) == EOF)
- FILE_OP_ERROR(path, "fclose");
- g_free(path);
-}
-
static gboolean inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
gpointer data)
{
gchar buf[MSGBUFSIZE];
IncSession *session = (IncSession *)data;
Pop3State *state = session->pop3_state;
- IncProgressDialog *inc_dialog = session->data;
+ IncProgressDialog *inc_dialog = (IncProgressDialog *)session->data;
ProgressDialog *dialog = inc_dialog->dialog;
gint cur_total;
gchar *total_size;
progress_dialog_set_percentage
(dialog, (gfloat)cur_total / (gfloat)state->total_bytes);
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)cur_total / (gfloat)state->total_bytes);
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)cur_total / (gfloat)state->total_bytes);
GTK_EVENTS_FLUSH();
- if (state->inc_state == INC_CANCEL)
+ if (session->inc_state == INC_CANCEL)
return FALSE;
else
return TRUE;
void inc_progress_update(Pop3State *state, Pop3Phase phase)
{
gchar buf[MSGBUFSIZE];
- IncProgressDialog *inc_dialog = state->session->data;
+ IncSession *session = (IncSession *)state->data;
+ IncProgressDialog *inc_dialog = (IncProgressDialog *)session->data;
ProgressDialog *dialog = inc_dialog->dialog;
gchar *total_size;
case POP3_GREETING_RECV:
break;
case POP3_GETAUTH_USER_SEND:
- case POP3_GETAUTH_USER_RECV:
case POP3_GETAUTH_PASS_SEND:
- case POP3_GETAUTH_PASS_RECV:
case POP3_GETAUTH_APOP_SEND:
- case POP3_GETAUTH_APOP_RECV:
progress_dialog_set_label(dialog, _("Authenticating..."));
break;
case POP3_GETRANGE_STAT_SEND:
- case POP3_GETRANGE_STAT_RECV:
progress_dialog_set_label
(dialog, _("Getting the number of new messages (STAT)..."));
break;
case POP3_GETRANGE_LAST_SEND:
- case POP3_GETRANGE_LAST_RECV:
progress_dialog_set_label
(dialog, _("Getting the number of new messages (LAST)..."));
break;
case POP3_GETRANGE_UIDL_SEND:
- case POP3_GETRANGE_UIDL_RECV:
progress_dialog_set_label
(dialog, _("Getting the number of new messages (UIDL)..."));
break;
case POP3_GETSIZE_LIST_SEND:
- case POP3_GETSIZE_LIST_RECV:
progress_dialog_set_label
(dialog, _("Getting the size of messages (LIST)..."));
break;
case POP3_TOP_SEND:
- case POP3_TOP_RECV:
g_snprintf(buf, sizeof(buf),
_("Retrieving header (%d / %d)"),
state->cur_msg, state->count);
(dialog,
(gfloat)(state->cur_msg) /
(gfloat)(state->count));
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)(state->cur_msg) /
- (gfloat)(state->count));
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)(state->cur_msg) /
+ (gfloat)(state->count));
break;
case POP3_RETR_SEND:
- case POP3_RETR_RECV:
Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
g_snprintf(buf, sizeof(buf),
_("Retrieving message (%d / %d) (%s / %s)"),
(dialog,
(gfloat)(state->cur_total_bytes) /
(gfloat)(state->total_bytes));
- gtk_progress_bar_update
- (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
- (gfloat)(state->cur_total_bytes) /
- (gfloat)(state->total_bytes));
+ if (inc_dialog->mainwin)
+ gtk_progress_bar_update
+ (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
+ (gfloat)(state->cur_total_bytes) /
+ (gfloat)(state->total_bytes));
break;
case POP3_DELETE_SEND:
- case POP3_DELETE_RECV:
- progress_dialog_set_label(dialog, _("Deleting message"));
+ if (state->msg[state->cur_msg].recv_time < state->current_time) {
+ g_snprintf(buf, sizeof(buf), _("Deleting message %d"),
+ state->cur_msg);
+ progress_dialog_set_label(dialog, buf);
+ }
break;
case POP3_LOGOUT_SEND:
- case POP3_LOGOUT_RECV:
progress_dialog_set_label(dialog, _("Quitting"));
break;
default:
{
FolderItem *inbox;
FolderItem *dropfolder;
- gint val;
gint msgnum;
/* CLAWS: get default inbox (perhaps per account) */
if (state->ac_prefs->inbox) {
/* CLAWS: get destination folder / mailbox */
- inbox = folder_find_item_from_identifier(state->ac_prefs->inbox);
+ inbox = folder_find_item_from_identifier
+ (state->ac_prefs->inbox);
if (!inbox)
inbox = folder_get_default_inbox();
} else
}
/* CLAWS: claws uses a global .processing folder for the filtering. */
- if (global_processing == NULL) {
- if (state->ac_prefs->filter_on_recv) {
- dropfolder =
- filter_get_dest_folder(prefs_common.fltlist, file);
- if (!dropfolder) dropfolder = inbox;
- else if (!strcmp(dropfolder->path, FILTER_NOT_RECEIVE)) {
- g_warning(_("a message won't be received\n"));
- return 1;
- }
- } else
- dropfolder = inbox;
- } else {
- dropfolder = folder_get_default_processing();
- }
+ dropfolder = folder_get_default_processing();
- val = GPOINTER_TO_INT(g_hash_table_lookup
- (state->folder_table, dropfolder));
- if (val == 0) {
- folder_item_scan(dropfolder);
- g_hash_table_insert(state->folder_table, dropfolder,
- GINT_TO_POINTER(1));
- }
-
/* add msg file to drop folder */
if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
unlink(file);
{
switch (istate) {
case INC_ERROR:
- if(!prefs_common.noerrorpanel) {
- alertpanel_error(_("Error occurred while processing mail."));
- }
+ if (!prefs_common.no_recv_err_panel)
+ alertpanel_error
+ (_("Error occurred while processing mail."));
break;
- case INC_NOSPACE:
+ case INC_NO_SPACE:
alertpanel_error(_("No disk space left."));
break;
+ case INC_IO_ERROR:
+ alertpanel_error(_("Can't write file."));
+ break;
+ case INC_SOCKET_ERROR:
+ alertpanel_error(_("Socket error."));
+ break;
+ case INC_LOCKED:
+ if (!prefs_common.no_recv_err_panel)
+ alertpanel_error(_("Mailbox is locked."));
+ break;
default:
break;
}
g_return_if_fail(dialog != NULL);
+ if (dialog->queue_list == NULL) {
+ inc_progress_dialog_destroy(dialog);
+ return;
+ }
+
session = dialog->queue_list->data;
sockinfo = session->pop3_state->sockinfo;
if (!sockinfo || session->atm->terminated == TRUE) return;
- session->pop3_state->inc_state = INC_CANCEL;
- pop3_automaton_terminate(sockinfo, session->atm);
- session->pop3_state->sockinfo = NULL;
+ session->pop3_state->cancelled = TRUE;
+ session->inc_state = INC_CANCEL;
+ session->atm->cancelled = TRUE;
+
+ log_message(_("Incorporation cancelled\n"));
}
gboolean inc_is_active(void)
inc_cancel((IncProgressDialog *)data);
}
+static gint inc_dialog_delete_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ IncProgressDialog *dialog = (IncProgressDialog *)data;
+
+ if (dialog->queue_list == NULL)
+ inc_progress_dialog_destroy(dialog);
+
+ return TRUE;
+}
+
static gint inc_spool(void)
{
gchar *mbox, *logname;
static void inc_spool_account(PrefsAccount *account)
{
FolderItem *inbox;
- FolderItem *dropfolder;
- gint val;
if (account->inbox) {
inbox = folder_find_item_from_path(account->inbox);
if (!list) return;
for (; list != NULL; list = list->next) {
- IncSession *session;
PrefsAccount *account = list->data;
if ((account->protocol == A_LOCAL) &&
gint msgs, size;
gint lockfd;
gchar tmp_mbox[MAXPATHLEN + 1];
- GHashTable *folder_table = NULL;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(mbox != NULL, -1);
if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
- debug_print(_("no messages in local mailbox.\n"));
+ debug_print("no messages in local mailbox.\n");
return 0;
} else if (size < 0)
return -1;
if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
return -1;
- g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox%d",
- get_rc_dir(), G_DIR_SEPARATOR, (gint)mbox);
+ g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%08x",
+ get_tmp_dir(), G_DIR_SEPARATOR, (gint)mbox);
if (copy_mbox(mbox, tmp_mbox) < 0) {
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
return -1;
}
- debug_print(_("Getting new messages from %s into %s...\n"),
+ debug_print("Getting new messages from %s into %s...\n",
mbox, dest->path);
- if (prefs_common.filter_on_inc)
- folder_table = g_hash_table_new(NULL, NULL);
- msgs = proc_mbox(dest, tmp_mbox, folder_table);
+ msgs = proc_mbox(dest, tmp_mbox);
unlink(tmp_mbox);
if (msgs >= 0) empty_mbox(mbox);
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
- if (folder_table) {
- if (!prefs_common.scan_all_after_inc) {
- g_hash_table_insert(folder_table, dest,
- GINT_TO_POINTER(1));
- folder_item_scan_foreach(folder_table);
- folderview_update_item_foreach(folder_table);
- }
- g_hash_table_destroy(folder_table);
+ 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_item_scan(dest);
- folderview_update_item(dest, FALSE);
+ folder_update_item(dest, TRUE);
}
return msgs;
else
buf = g_strdup(prefs_common.newmail_notify_cmd);
- system(buf);
+ execute_command_line(buf, TRUE);
g_free(buf);
}
static void inc_autocheck_timer_set_interval(guint interval)
{
inc_autocheck_timer_remove();
-
- if (prefs_common.autochk_newmail && autocheck_data) {
+ /* last test is to avoid re-enabling auto_check after modifying
+ the common preferences */
+ if (prefs_common.autochk_newmail && autocheck_data
+ && prefs_common.work_offline == FALSE) {
autocheck_timer = gtk_timeout_add
(interval, inc_autocheck_func, autocheck_data);
debug_print("added timer = %d\n", autocheck_timer);
projects / claws.git / blobdiff