#include "filter.h"
#include "automaton.h"
#include "folder.h"
+#include "filtering.h"
#include "pixmaps/continue.xpm"
#include "pixmaps/complete.xpm"
static gint connection_check_cb (Automaton *atm);
#endif
+static void 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 gint get_spool (FolderItem *dest,
const gchar *mbox);
+static void inc_all_spool(void);
+
+static gint inc_autocheck_func (gpointer data);
static void inc_finished(MainWindow *mainwin)
{
FolderItem *item;
+ /* 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() */
+
if (prefs_common.open_inbox_on_inc) {
item = cur_account && cur_account->inbox
? folder_find_item_from_path(cur_account->inbox)
void inc_mail(MainWindow *mainwin)
{
+ inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
if (prefs_common.use_extinc && prefs_common.extinc_path) {
/* external incorporating program */
if ((pid = fork()) < 0) {
perror("fork");
+ inc_autocheck_timer_set();
return;
}
waitpid(pid, NULL, 0);
if (prefs_common.inc_local) inc_spool();
+ inc_all_spool();
} else {
if (prefs_common.inc_local) inc_spool();
+ inc_all_spool();
inc_account_mail(cur_account, mainwin);
}
inc_finished(mainwin);
+ inc_autocheck_timer_set();
}
static void inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
GList *list, *queue_list = NULL;
IncProgressDialog *inc_dialog;
+ inc_autocheck_timer_remove();
summary_write_cache(mainwin->summaryview);
if (prefs_common.inc_local) inc_spool();
list = account_get_list();
- if (!list) return;
+ if (!list) {
+ inc_autocheck_timer_set();
+ return;
+ }
for (; list != NULL; list = list->next) {
IncSession *session;
}
}
- if (!queue_list) return;
+ if (!queue_list) {
+ inc_autocheck_timer_set();
+ return;
+ }
inc_dialog = inc_progress_dialog_create();
inc_dialog->queue_list = queue_list;
inc_start(inc_dialog);
inc_finished(mainwin);
+ inc_autocheck_timer_set();
}
static IncProgressDialog *inc_progress_dialog_create(void)
GTK_SIGNAL_FUNC(inc_cancel), dialog);
gtk_signal_connect(GTK_OBJECT(progress->window), "delete_event",
GTK_SIGNAL_FUNC(gtk_true), NULL);
- manage_window_set_transient(GTK_WINDOW(progress->window));
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_set_transient(GTK_WINDOW(progress->window));
+ }
progress_dialog_set_value(progress, 0.0);
- gtk_widget_show(progress->window);
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ gtk_widget_show(progress->window);
+ }
PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
PIXMAP_CREATE(progress->clist,
currentxpm, currentxpmmask, continue_xpm);
PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
- gtk_widget_show_now(progress->window);
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ gtk_widget_show_now(progress->window);
+ }
dialog->dialog = progress;
dialog->queue_list = NULL;
static void inc_pop3_state_destroy(Pop3State *state)
{
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);
inc_progress_dialog_clear(inc_dialog);
+ gtk_clist_moveto(clist, num, 0, 1.0, 0.0);
+
pop3_state->user = g_strdup(pop3_state->ac_prefs->userid);
if (pop3_state->ac_prefs->passwd)
pop3_state->pass =
pass = input_dialog_with_invisible(_("Input password"),
message, NULL);
g_free(message);
- manage_window_focus_in(inc_dialog->mainwin->window,
- NULL, NULL);
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_focus_in(inc_dialog->mainwin->window,
+ NULL, NULL);
+ }
if (pass) {
pop3_state->ac_prefs->tmp_pass = g_strdup(pass);
pop3_state->pass = pass;
}
if (pop3_state->error_val == PS_AUTHFAIL) {
- manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
- alertpanel_error
- (_("Authorization for %s on %s failed"),
- pop3_state->user,
- pop3_state->ac_prefs->recv_server);
+ if(!prefs_common.noerrorpanel) {
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
+ }
+ alertpanel_error
+ (_("Authorization for %s on %s failed"),
+ pop3_state->user,
+ pop3_state->ac_prefs->recv_server);
+ }
}
statusbar_pop_all();
- manage_window_focus_in(inc_dialog->mainwin->window, NULL, NULL);
-
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_focus_in(inc_dialog->mainwin->window, NULL, NULL);
+ }
+
folder_item_scan_foreach(pop3_state->folder_table);
folderview_update_item_foreach(pop3_state->folder_table);
gchar *server;
gushort port;
gchar *buf;
- AtmHandler handlers[] = {
+ static AtmHandler handlers[] = {
pop3_greeting_recv ,
pop3_getauth_user_send , pop3_getauth_user_recv,
pop3_getauth_pass_send , pop3_getauth_pass_recv,
pop3_getrange_stat_send , pop3_getrange_stat_recv,
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_retr_send , pop3_retr_recv,
pop3_delete_send , pop3_delete_recv,
pop3_logout_send , pop3_logout_recv
atm->num = POP3_GREETING_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->pop_ssl ? 995 : 110);
+#else
port = pop3_state->ac_prefs->set_popport ?
pop3_state->ac_prefs->popport : 110;
+#endif
buf = g_strdup_printf(_("Connecting to POP3 server: %s ..."), server);
log_message("%s\n", buf);
#if USE_THREADS
if ((sockinfo = sock_connect_with_thread(server, port)) == NULL) {
#else
- if ((sockinfo = sock_connect_nb(server, port)) == NULL) {
+ if ((sockinfo = sock_connect(server, port)) == NULL) {
#endif
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
server, port);
- manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
- alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
- server, port);
- manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+ if(!prefs_common.noerrorpanel) {
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
+ }
+ alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
+ server, port);
+ manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+ }
pop3_automaton_terminate(NULL, atm);
automaton_destroy(atm);
pop3_state->sockinfo = sockinfo;
atm->help_sock = sockinfo;
+#ifdef USE_SSL
+ if(pop3_state->ac_prefs->pop_ssl) {
+ if(!ssl_init_socket(sockinfo)) {
+ pop3_automaton_terminate(NULL, atm);
+ automaton_destroy(atm);
+ return INC_ERROR;
+ } else {
+ sockinfo->ssl = NULL;
+ }
+#endif
+
+ 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);
gtk_main();
+ recv_set_ui_func(NULL, NULL);
+
#if USE_THREADS
- //pthread_join(sockinfo->connect_thr, NULL);
+/*
+ pthread_join(sockinfo->connect_thr, NULL);
+*/
+#endif
+
+#if USE_SSL
+ ssl_done_socket(sockinfo);
#endif
automaton_destroy(atm);
IncProgressDialog *inc_dialog = state->session->data;
SockInfo *sockinfo = state->sockinfo;
- //g_print("connection check\n");
+ /* g_print("connection check\n"); */
if (sockinfo->state == CONN_LOOKUPFAILED ||
sockinfo->state == CONN_FAILED) {
atm->timeout_tag = 0;
- pop3_automaton_terminate(sockinfo->sock, atm);
log_warning(_("Can't connect to POP3 server: %s:%d\n"),
sockinfo->hostname, sockinfo->port);
- manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
- 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(!prefs_common.noerrorpanel) {
+ if((prefs_common.receive_dialog == RECVDIALOG_ALWAYS) ||
+ ((prefs_common.receive_dialog == RECVDIALOG_WINDOW_ACTIVE) && focus_window)) {
+ manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
+ }
+ alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
+ sockinfo->hostname, sockinfo->port);
+ manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+ }
+ pop3_automaton_terminate(sockinfo, atm);
return FALSE;
} else if (sockinfo->state == CONN_ESTABLISHED) {
atm->timeout_tag = 0;
- atm->tag = gdk_input_add(sockinfo->sock,
- atm->state[atm->num].condition,
- automaton_input_cb, atm);
+ atm->tag = sock_gdk_input_add(sockinfo,
+ atm->state[atm->num].condition,
+ automaton_input_cb, atm);
return FALSE;
} else {
return TRUE;
}
#endif
+static void 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;
+ ProgressDialog *dialog = inc_dialog->dialog;
+ gint cur_total;
+ gchar *total_size;
+
+ cur_total = state->cur_total_bytes + read_bytes;
+ if (cur_total > state->total_bytes)
+ cur_total = state->total_bytes;
+
+ Xstrdup_a(total_size, to_human_readable(state->total_bytes), return);
+ g_snprintf(buf, sizeof(buf),
+ _("Retrieving message (%d / %d) (%s / %s)"),
+ state->cur_msg, state->count,
+ to_human_readable(cur_total), total_size);
+ progress_dialog_set_label(dialog, buf);
+
+ progress_dialog_set_percentage
+ (dialog, (gfloat)cur_total / (gfloat)state->total_bytes);
+ GTK_EVENTS_FLUSH();
+}
+
void inc_progress_update(Pop3State *state, Pop3Phase phase)
{
gchar buf[MSGBUFSIZE];
IncProgressDialog *inc_dialog = state->session->data;
ProgressDialog *dialog = inc_dialog->dialog;
+ gchar *total_size;
switch (phase) {
case POP3_GREETING_RECV:
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, _("Authorizing..."));
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 number of new messages"));
+ 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_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)"),
- state->cur_msg, state->count);
+ _("Retrieving message (%d / %d) (%s / %s)"),
+ state->cur_msg, state->count,
+ to_human_readable(state->cur_total_bytes),
+ total_size);
progress_dialog_set_label(dialog, buf);
progress_dialog_set_percentage
- (dialog, (gfloat)state->cur_msg / state->count);
+ (dialog,
+ (gfloat)(state->cur_total_bytes) /
+ (gfloat)(state->total_bytes));
break;
case POP3_DELETE_SEND:
case POP3_DELETE_RECV:
progress_dialog_set_label(dialog, _("Quitting"));
break;
default:
+ break;
}
}
FolderItem *inbox;
FolderItem *dropfolder;
gint val;
-
+ gint msgnum;
+
if (state->ac_prefs->inbox) {
inbox = folder_find_item_from_path(state->ac_prefs->inbox);
if (!inbox)
return -1;
}
- 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
+ if (prefs_filtering == NULL) {
+ /* old filtering */
+ 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 {
+ /* new filtering */
dropfolder = inbox;
+ }
val = GPOINTER_TO_INT(g_hash_table_lookup
(state->folder_table, dropfolder));
GINT_TO_POINTER(1));
}
- if (folder_item_add_msg(dropfolder, file) < 0) {
- unlink(file);
- return -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;
+ }
}
+ else {
+ filter_incoming_message(dropfolder, file, state->folder_table);
+ }
- unlink(file);
return 0;
}
{
switch (istate) {
case INC_ERROR:
- alertpanel_error(_("Error occurred while processing mail."));
+ if(!prefs_common.noerrorpanel) {
+ alertpanel_error(_("Error occurred while processing mail."));
+ }
break;
case INC_NOSPACE:
alertpanel_error(_("No disk space left."));
break;
default:
+ break;
}
}
if (sockinfo->state == CONN_READY ||
sockinfo->state == CONN_LOOKUPSUCCESS) {
pthread_cancel(sockinfo->connect_thr);
- //pthread_kill(sockinfo->connect_thr, SIGINT);
+ /* pthread_kill(sockinfo->connect_thr, SIGINT); */
g_print("connection was cancelled.\n");
}
#endif
return msgs;
}
+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 (!inbox)
+ inbox = folder_get_default_inbox();
+ } else
+ inbox = folder_get_default_inbox();
+
+ get_spool(inbox, account->local_mbox);
+}
+
+static void inc_all_spool(void)
+{
+ GList *list = NULL;
+
+ list = account_get_list();
+ if (!list) return;
+
+ for (; list != NULL; list = list->next) {
+ IncSession *session;
+ PrefsAccount *account = list->data;
+
+ if (account->protocol == A_LOCAL)
+ inc_spool_account(account);
+ }
+}
+
static gint get_spool(FolderItem *dest, const gchar *mbox)
{
gint msgs, size;
gint lockfd;
- gchar *tmp_mbox = "/tmp/tmpmbox";
+ gchar tmp_mbox[MAXPATHLEN + 1];
GHashTable *folder_table = NULL;
g_return_val_if_fail(dest != NULL, -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);
+
if (copy_mbox(mbox, tmp_mbox) < 0)
return -1;
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
if (folder_table) {
+ 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);
}
return msgs;
-}
\ No newline at end of file
+}
+
+static guint autocheck_timer = 0;
+static gpointer autocheck_data = NULL;
+
+void inc_autocheck_timer_init(MainWindow *mainwin)
+{
+ autocheck_data = mainwin;
+ inc_autocheck_timer_set();
+}
+
+void inc_autocheck_timer_set(void)
+{
+ inc_autocheck_timer_remove();
+
+ if (prefs_common.autochk_newmail && autocheck_data) {
+ autocheck_timer = gtk_timeout_add
+ (prefs_common.autochk_itv * 60000,
+ inc_autocheck_func,
+ autocheck_data);
+ }
+}
+
+void inc_autocheck_timer_remove(void)
+{
+ if (autocheck_timer) {
+ gtk_timeout_remove(autocheck_timer);
+ autocheck_timer = 0;
+ }
+}
+
+static gint inc_autocheck_func(gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ inc_all_account_mail(mainwin);
+
+ return FALSE;
+}
projects / claws.git / blobdiff