/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* 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
#include "account.h"
#include "procmsg.h"
#include "socket.h"
+#include "ssl.h"
#include "pop.h"
#include "recv.h"
#include "mbox.h"
#include "gtkutils.h"
#include "statusbar.h"
#include "manage_window.h"
+#include "stock_pixmap.h"
#include "progressdialog.h"
#include "inputdialog.h"
#include "alertpanel.h"
#include "automaton.h"
#include "folder.h"
#include "filtering.h"
+#include "selective_download.h"
-#include "pixmaps/continue.xpm"
-#include "pixmaps/complete.xpm"
-#include "pixmaps/error.xpm"
+static GList *inc_dialog_list = NULL;
-GdkPixmap *currentxpm;
-GdkBitmap *currentxpmmask;
-GdkPixmap *errorxpm;
-GdkBitmap *errorxpmmask;
-GdkPixmap *okxpm;
-GdkBitmap *okxpmmask;
+static guint inc_lock_count = 0;
+
+static GdkPixmap *currentxpm;
+static GdkBitmap *currentxpmmask;
+static GdkPixmap *errorxpm;
+static GdkBitmap *errorxpmmask;
+static GdkPixmap *okxpm;
+static GdkBitmap *okxpmmask;
#define MSGBUFSIZE 8192
static GHashTable *inc_get_uidl_table (PrefsAccount *ac_prefs);
static void inc_write_uidl_list (Pop3State *state);
-#if USE_THREADS
-static gint connection_check_cb (Automaton *atm);
-#endif
-
-static void inc_pop3_recv_func (SockInfo *sock,
+static gboolean inc_pop3_recv_func (SockInfo *sock,
gint count,
gint read_bytes,
gpointer data);
static void inc_put_error (IncState istate);
-static void inc_cancel (GtkWidget *widget,
+static void inc_cancel_cb (GtkWidget *widget,
gpointer data);
static gint inc_spool (void);
static gint get_spool (FolderItem *dest,
const gchar *mbox);
+static void inc_spool_account(PrefsAccount *account);
static void inc_all_spool(void);
+static void inc_autocheck_timer_set_interval (guint interval);
+static gint inc_autocheck_func (gpointer data);
-static gint inc_autocheck_func (gpointer data);
+static void inc_notify_cmd (gint new_msgs,
+ gboolean notify);
+#define FOLDER_SUMMARY_MISMATCH(f, s) \
+ (f) && (s) ? ((s)->newmsgs != (f)->new) || ((f)->unread != (s)->unread) || ((f)->total != (s)->messages) \
+ : FALSE
+
/**
* inc_finished:
* @mainwin: Main window.
FolderItem *item;
if (prefs_common.scan_all_after_inc)
- folderview_update_all_node();
- /* XXX: major problems right here. if we change marks after
- * incorporation of mail, folderview_select() rewrites it
- * right under our nose. folderview_select() eventually
- * calls summary_show(), which rewrites the cache twice:
- * one for the previously selected FolderItem*, and one
- * for the newly selected FolderItem*
- *
- * since filtering also allows changing mark files,
- * i've solved this by using a global variable (in
- * SummmaryView*). a better solution is to use the folder
- * hash table, and see whether the newly and currently
- * selected FolderItem* where updated by the filtering. */
-
- mainwin->summaryview->filtering_happened = TRUE;
-
- /* XXX: filtering_happened is reset by summary_show() */
+ folderview_check_new(NULL);
if (!new_messages && !prefs_common.scan_all_after_inc) return;
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();
- folderview_unselect(mainwin->folderview);
- folderview_select(mainwin->folderview, item);
+ if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
+ folderview_unselect(mainwin->folderview);
+ folderview_select(mainwin->folderview, item);
+ }
} else {
item = mainwin->summaryview->folder_item;
- folderview_unselect(mainwin->folderview);
- folderview_select(mainwin->folderview, item);
+ if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
+ folderview_unselect(mainwin->folderview);
+ folderview_select(mainwin->folderview, item);
+ }
}
}
-void inc_mail(MainWindow *mainwin)
+void inc_mail(MainWindow *mainwin, gboolean notify)
{
gint new_msgs = 0;
+ 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_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
main_window_lock(mainwin);
- if (prefs_common.use_extinc && prefs_common.extinc_path) {
- gint pid;
-
+ if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
/* external incorporating program */
- if ((pid = fork()) < 0) {
- perror("fork");
+ if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
main_window_unlock(mainwin);
inc_autocheck_timer_set();
return;
}
- if (pid == 0) {
- execlp(prefs_common.extinc_path,
- g_basename(prefs_common.extinc_path),
- NULL);
-
- /* this will be called when failed */
- perror("exec");
- _exit(1);
- }
-
- /* wait until child process is terminated */
- waitpid(pid, NULL, 0);
-
if (prefs_common.inc_local)
new_msgs = inc_spool();
} else {
inc_finished(mainwin, new_msgs > 0);
main_window_unlock(mainwin);
+ inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
}
+gint inc_selective_download(MainWindow *mainwin, gint session_type)
+{
+ PrefsAccount *account = cur_account;
+ gint new_msgs = 0;
+
+ account->session_type = session_type;
+ new_msgs = inc_account_mail(account, mainwin);
+ account->session_type = RETR_NORMAL;
+
+ return new_msgs;
+}
+
static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
{
IncProgressDialog *inc_dialog;
IncSession *session;
gchar *text[3];
- session = inc_session_new(account);
- if (!session) return 0;
-
- inc_dialog = inc_progress_dialog_create();
- inc_dialog->queue_list = g_list_append(inc_dialog->queue_list, session);
- inc_dialog->mainwin = mainwin;
- session->data = inc_dialog;
-
- text[0] = NULL;
- text[1] = account->account_name;
- text[2] = _("Standby");
- gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
-
- return inc_start(inc_dialog);
+ switch (account->protocol) {
+ case A_IMAP4:
+ case A_NNTP:
+ folderview_check_new(FOLDER(account->folder));
+ return 1;
+
+ case A_POP3:
+ case A_APOP:
+ session = inc_session_new(account);
+ if (!session) return 0;
+
+ inc_dialog = inc_progress_dialog_create();
+ inc_dialog->queue_list = g_list_append(inc_dialog->queue_list,
+ session);
+ inc_dialog->mainwin = mainwin;
+ session->data = inc_dialog;
+
+ text[0] = NULL;
+ text[1] = account->account_name;
+ 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);
+
+ return inc_start(inc_dialog);
+
+ case A_LOCAL:
+ inc_spool_account(account);
+ return 1;
+ }
}
-void inc_all_account_mail(MainWindow *mainwin)
+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);
if (!list) {
inc_finished(mainwin, new_msgs > 0);
main_window_unlock(mainwin);
+ inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
return;
}
+ /* check local folders */
+ inc_all_spool();
+
+ /* check IMAP4 folders */
for (; list != NULL; list = list->next) {
- IncSession *session;
PrefsAccount *account = list->data;
+ if ((account->protocol == A_IMAP4 ||
+ account->protocol == A_NNTP) && account->recv_at_getall)
+ folderview_check_new(FOLDER(account->folder));
+ }
+ /* check POP3 accounts */
+ for (list = account_get_list(); list != NULL; list = list->next) {
+ IncSession *session;
+ PrefsAccount *account = list->data;
+ account->session_type = RETR_NORMAL;
if (account->recv_at_getall) {
session = inc_session_new(account);
if (session)
if (!queue_list) {
inc_finished(mainwin, new_msgs > 0);
main_window_unlock(mainwin);
+ inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
return;
}
gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
}
+ main_window_set_toolbar_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
+
new_msgs += inc_start(inc_dialog);
inc_finished(mainwin, new_msgs > 0);
main_window_unlock(mainwin);
+ inc_notify_cmd(new_msgs, notify);
inc_autocheck_timer_set();
}
gtk_window_set_title(GTK_WINDOW(progress->window),
_("Retrieving new messages"));
gtk_signal_connect(GTK_OBJECT(progress->cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(inc_cancel), dialog);
+ GTK_SIGNAL_FUNC(inc_cancel_cb), dialog);
gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
GTK_SIGNAL_FUNC(gtk_true), NULL);
+ /* manage_window_set_transient(GTK_WINDOW(progress->window)); */
progress_dialog_set_value(progress, 0.0);
- PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
- PIXMAP_CREATE(progress->clist,
- currentxpm, currentxpmmask, continue_xpm);
- PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_COMPLETE,
+ &okxpm, &okxpmmask);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_CONTINUE,
+ ¤txpm, ¤txpmmask);
+ stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_ERROR,
+ &errorxpm, &errorxpmmask);
if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
(prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE &&
dialog->dialog = progress;
dialog->queue_list = NULL;
+ inc_dialog_list = g_list_append(inc_dialog_list, dialog);
+
return 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);
progress_dialog_destroy(inc_dialog->dialog);
state->ac_prefs = account;
state->folder_table = g_hash_table_new(NULL, NULL);
- state->id_table = inc_get_uidl_table(account);
- state->id_list = NULL;
- state->new_id_list = 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);
- g_free(state->sizes);
- if (state->id_table) {
- hash_free_strings(state->id_table);
- g_hash_table_destroy(state->id_table);
- }
- slist_free_strings(state->id_list);
- slist_free_strings(state->new_id_list);
- g_slist_free(state->id_list);
- g_slist_free(state->new_id_list);
+ 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);
gint error_num = 0;
gint new_msgs = 0;
- /* gtk_label_set_text(GTK_LABEL(inc_dialog->mainwin->statuslabel),
- _("Receiving")); */
-
while (inc_dialog->queue_list != NULL) {
session = inc_dialog->queue_list->data;
pop3_state = session->pop3_state;
inc_progress_dialog_clear(inc_dialog);
+ gtk_clist_moveto(clist, num, -1, 1.0, 0.0);
+
pop3_state->user = g_strdup(pop3_state->ac_prefs->userid);
if (pop3_state->ac_prefs->passwd)
pop3_state->pass =
g_strdup(pop3_state->ac_prefs->tmp_pass);
else {
gchar *pass;
- gchar *message;
- message = g_strdup_printf
- (_("Input password for %s on %s:"),
- pop3_state->user,
- pop3_state->ac_prefs->recv_server);
+ pass = input_dialog_query_password
+ (pop3_state->ac_prefs->recv_server,
+ pop3_state->user);
- pass = input_dialog_with_invisible(_("Input password"),
- message, NULL);
- g_free(message);
if (inc_dialog->show_dialog)
manage_window_focus_in
(inc_dialog->mainwin->window,
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
+ 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);
+ }
+ g_slist_free(msglist);
+ }
+
+
new_msgs += pop3_state->cur_total_num;
if (!prefs_common.scan_all_after_inc) {
num++;
}
- /* gtk_label_set_text(GTK_LABEL(inc_dialog->mainwin->statuslabel), ""); */
-
- if (error_num) {
+ if (error_num && !prefs_common.noerrorpanel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
NULL, NULL);
return new_msgs;
}
-
static IncState inc_pop3_session_do(IncSession *session)
{
Pop3State *pop3_state = session->pop3_state;
pop3_getrange_last_send , pop3_getrange_last_recv,
pop3_getrange_uidl_send , pop3_getrange_uidl_recv,
pop3_getsize_list_send , pop3_getsize_list_recv,
+ pop3_top_send , pop3_top_recv,
pop3_retr_send , pop3_retr_recv,
pop3_delete_send , pop3_delete_recv,
pop3_logout_send , pop3_logout_recv
server = pop3_state->ac_prefs->recv_server;
#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->popport :
+ pop3_state->ac_prefs->ssl_pop ? 995 : 110;
#else
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport : 110;
progress_dialog_set_label(inc_dialog->dialog, buf);
g_free(buf);
GTK_EVENTS_FLUSH();
+ statusbar_pop_all();
-#if USE_THREADS
- if ((sockinfo = sock_connect_with_thread(server, port)) == NULL) {
-#else
if ((sockinfo = sock_connect(server, port)) == NULL) {
-#endif
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
server, port);
if(!prefs_common.noerrorpanel) {
}
pop3_automaton_terminate(NULL, atm);
automaton_destroy(atm);
+ return INC_CONNECT_ERROR;
+ }
+#if USE_SSL
+ if (pop3_state->ac_prefs->ssl_pop && !ssl_init_socket(sockinfo)) {
+ pop3_automaton_terminate(NULL, atm);
+ automaton_destroy(atm);
return INC_CONNECT_ERROR;
}
+#endif
/* :WK: Hmmm, with the later sock_gdk_input, we have 2 references
* to the sock structure - implement a reference counter?? */
pop3_state->sockinfo = sockinfo;
atm->help_sock = sockinfo;
-#ifdef USE_SSL
- if(pop3_state->ac_prefs->ssl_pop) {
- if(!ssl_init_socket(sockinfo)) {
- pop3_automaton_terminate(NULL, atm);
- automaton_destroy(atm);
-
- return INC_CONNECT_ERROR;
- }
- } else {
- sockinfo->ssl = NULL;
- }
-#endif
-
-
+ log_verbosity_set(TRUE);
recv_set_ui_func(inc_pop3_recv_func, session);
-#if USE_THREADS
- atm->timeout_tag = gtk_timeout_add
- (TIMEOUT_ITV, (GtkFunction)connection_check_cb, atm);
-#else
atm->tag = sock_gdk_input_add(sockinfo,
atm->state[atm->num].condition,
automaton_input_cb, atm);
-#endif
- gtk_main();
+ while (!atm->terminated)
+ gtk_main_iteration();
+ log_verbosity_set(FALSE);
recv_set_ui_func(NULL, NULL);
-#if USE_THREADS
-/*
- pthread_join(sockinfo->connect_thr, NULL);
-*/
-#endif
-
-#if USE_SSL
- ssl_done_socket(sockinfo);
-#endif
automaton_destroy(atm);
return pop3_state->inc_state;
static gint pop3_automaton_terminate(SockInfo *source, Automaton *atm)
{
+ if (atm->terminated) return 0;
+
if (atm->tag > 0) {
gdk_input_remove(atm->tag);
atm->tag = 0;
gtk_timeout_remove(atm->timeout_tag);
atm->timeout_tag = 0;
}
- if (source) {
+ if (source)
sock_close(source);
- gtk_main_quit();
- }
atm->terminated = TRUE;
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, "r")) == NULL) {
+
+ if ((fp = fopen(path, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
g_free(path);
return NULL;
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);
- g_hash_table_insert(table, g_strdup(buf), GINT_TO_POINTER(1));
+
+ /* 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;
}
{
gchar *path;
FILE *fp;
- GSList *cur;
-
- if (!state->id_list) return;
+ 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, "w")) == NULL) {
+ if ((fp = fopen(path, "wb")) == NULL) {
FILE_OP_ERROR(path, "fopen");
g_free(path);
return;
}
- for (cur = state->id_list; cur != NULL; cur = cur->next) {
- if (fputs((gchar *)cur->data, fp) == EOF) {
- FILE_OP_ERROR(path, "fputs");
- break;
- }
- if (fputc('\n', fp) == EOF) {
- FILE_OP_ERROR(path, "fputc");
- break;
- }
- }
+ g_date_clear(&curdate, 1);
- if (fclose(fp) == EOF) FILE_OP_ERROR(path, "fclose");
- g_free(path);
-}
-
-#if USE_THREADS
-static gint connection_check_cb(Automaton *atm)
-{
- Pop3State *state = atm->data;
- IncProgressDialog *inc_dialog = state->session->data;
- SockInfo *sockinfo = state->sockinfo;
-
- /* g_print("connection check\n"); */
-
- if (sockinfo->state == CONN_LOOKUPFAILED ||
- sockinfo->state == CONN_FAILED) {
- atm->timeout_tag = 0;
- log_warning(_("Can't connect to POP3 server: %s:%d\n"),
- sockinfo->hostname, sockinfo->port);
- if(!prefs_common.noerrorpanel) {
- 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);
+ 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;
}
- alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
- sockinfo->hostname, sockinfo->port);
- manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+ 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;
+ }
}
- pop3_automaton_terminate(sockinfo, atm);
- return FALSE;
- } else if (sockinfo->state == CONN_ESTABLISHED) {
- atm->timeout_tag = 0;
- atm->tag = sock_gdk_input_add(sockinfo,
- atm->state[atm->num].condition,
- automaton_input_cb, atm);
- return FALSE;
- } else {
- return TRUE;
}
+
+ if (fclose(fp) == EOF)
+ FILE_OP_ERROR(path, "fclose");
+ g_free(path);
}
-#endif
-static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
- gpointer data)
+static gboolean inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
+ gpointer data)
{
gchar buf[MSGBUFSIZE];
IncSession *session = (IncSession *)data;
if (cur_total > state->total_bytes)
cur_total = state->total_bytes;
- Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
+ Xstrdup_a(total_size, to_human_readable(state->total_bytes),
+ return FALSE);
g_snprintf(buf, sizeof(buf),
_("Retrieving message (%d / %d) (%s / %s)"),
state->cur_msg, state->count,
(GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar),
(gfloat)cur_total / (gfloat)state->total_bytes);
GTK_EVENTS_FLUSH();
+
+ if (state->inc_state == INC_CANCEL)
+ return FALSE;
+ else
+ return TRUE;
}
void inc_progress_update(Pop3State *state, Pop3Phase phase)
case POP3_GETAUTH_PASS_RECV:
case POP3_GETAUTH_APOP_SEND:
case POP3_GETAUTH_APOP_RECV:
- progress_dialog_set_label(dialog, _("Authorizing..."));
+ progress_dialog_set_label(dialog, _("Authenticating..."));
break;
case POP3_GETRANGE_STAT_SEND:
case POP3_GETRANGE_STAT_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);
+ progress_dialog_set_label (dialog, buf);
+ progress_dialog_set_percentage
+ (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));
+ break;
case POP3_RETR_SEND:
case POP3_RETR_RECV:
Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
FolderItem *dropfolder;
gint val;
gint msgnum;
-
+
+ /* CLAWS: get default inbox (perhaps per account) */
if (state->ac_prefs->inbox) {
- inbox = folder_find_item_from_path(state->ac_prefs->inbox);
+ /* CLAWS: get destination folder / mailbox */
+ inbox = folder_find_item_from_identifier
+ (state->ac_prefs->inbox);
if (!inbox)
inbox = folder_get_default_inbox();
} else
return -1;
}
- if (prefs_filtering == NULL) {
- /* old filtering */
+ /* 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);
} else
dropfolder = inbox;
} else {
- /* new filtering */
- dropfolder = inbox;
+ dropfolder = folder_get_default_processing();
}
val = GPOINTER_TO_INT(g_hash_table_lookup
g_hash_table_insert(state->folder_table, dropfolder,
GINT_TO_POINTER(1));
}
-
- if (prefs_filtering == NULL || !state->ac_prefs->filter_on_recv) {
- if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
- unlink(file);
- return -1;
- }
+
+ /* add msg file to drop folder */
+ if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
+ unlink(file);
+ return -1;
}
- else {
- filter_incoming_message(dropfolder, file, state->folder_table);
- }
return 0;
}
}
}
-static void inc_cancel(GtkWidget *widget, gpointer data)
+static void inc_cancel(IncProgressDialog *dialog)
{
- IncProgressDialog *dialog = data;
- IncSession *session = dialog->queue_list->data;
- SockInfo *sockinfo = session->pop3_state->sockinfo;
-
-#if USE_THREADS
- if (sockinfo->state == CONN_READY ||
- sockinfo->state == CONN_LOOKUPSUCCESS) {
- pthread_cancel(sockinfo->connect_thr);
- /* pthread_kill(sockinfo->connect_thr, SIGINT); */
- g_print("connection was cancelled.\n");
- }
-#endif
+ IncSession *session;
+ SockInfo *sockinfo;
+
+ g_return_if_fail(dialog != NULL);
+
+ 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;
+}
+
+gboolean inc_is_active(void)
+{
+ return (inc_dialog_list != NULL);
+}
+
+void inc_cancel_all(void)
+{
+ GList *cur;
+
+ for (cur = inc_dialog_list; cur != NULL; cur = cur->next)
+ inc_cancel((IncProgressDialog *)cur->data);
+}
+
+static void inc_cancel_cb(GtkWidget *widget, gpointer data)
+{
+ inc_cancel((IncProgressDialog *)data);
}
static gint inc_spool(void)
IncSession *session;
PrefsAccount *account = list->data;
- if (account->protocol == A_LOCAL)
+ if ((account->protocol == A_LOCAL) &&
+ (account->recv_at_getall))
inc_spool_account(account);
}
}
g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox%d",
get_rc_dir(), G_DIR_SEPARATOR, (gint)mbox);
- if (copy_mbox(mbox, tmp_mbox) < 0)
+ 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"),
mbox, dest->path);
return msgs;
}
+void inc_lock(void)
+{
+ inc_lock_count++;
+}
+
+void inc_unlock(void)
+{
+ if (inc_lock_count > 0)
+ inc_lock_count--;
+}
+
static guint autocheck_timer = 0;
static gpointer autocheck_data = NULL;
+static void inc_notify_cmd(gint new_msgs, gboolean notify)
+{
+
+ gchar *buf;
+
+ if (!(new_msgs && notify && prefs_common.newmail_notify_cmd &&
+ *prefs_common.newmail_notify_cmd))
+ return;
+ if ((buf = strchr(prefs_common.newmail_notify_cmd, '%')) &&
+ buf[1] == 'd' && !strchr(&buf[1], '%'))
+ buf = g_strdup_printf(prefs_common.newmail_notify_cmd,
+ new_msgs);
+ else
+ buf = g_strdup(prefs_common.newmail_notify_cmd);
+
+ execute_command_line(buf, TRUE);
+
+ g_free(buf);
+}
+
void inc_autocheck_timer_init(MainWindow *mainwin)
{
autocheck_data = mainwin;
inc_autocheck_timer_set();
}
-void inc_autocheck_timer_set(void)
+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
- (prefs_common.autochk_itv * 60000,
- inc_autocheck_func,
- autocheck_data);
+ (interval, inc_autocheck_func, autocheck_data);
+ debug_print("added timer = %d\n", autocheck_timer);
}
}
+void inc_autocheck_timer_set(void)
+{
+ inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000);
+}
+
void inc_autocheck_timer_remove(void)
{
if (autocheck_timer) {
+ debug_print("removed timer = %d\n", autocheck_timer);
gtk_timeout_remove(autocheck_timer);
autocheck_timer = 0;
}
{
MainWindow *mainwin = (MainWindow *)data;
- inc_all_account_mail(mainwin);
+ if (inc_lock_count) {
+ debug_print("autocheck is locked.\n");
+ inc_autocheck_timer_set_interval(1000);
+ return FALSE;
+ }
+
+ inc_all_account_mail(mainwin, prefs_common.newmail_notify_auto);
return FALSE;
}
projects / claws.git / blobdiff