sync with Hiroyuki's 0.5.0claws2-3
[claws.git] / src / inc.c
index e1ca14362e7f569f361279a67d7c6946bcb1414a..85791abe09469ab78dae371bbcb37cceee95cbfe 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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 "filter.h"
 #include "automaton.h"
 #include "folder.h"
+#include "filtering.h"
+
+#include "pixmaps/continue.xpm"
+#include "pixmaps/complete.xpm"
+#include "pixmaps/error.xpm"
+
+GdkPixmap *currentxpm;
+GdkBitmap *currentxpmmask;
+GdkPixmap *errorxpm;
+GdkBitmap *errorxpmmask;
+GdkPixmap *okxpm;
+GdkBitmap *okxpmmask;
 
 #define MSGBUFSIZE     8192
 
@@ -76,7 +88,7 @@ static Pop3State *inc_pop3_state_new  (PrefsAccount           *account);
 static void inc_pop3_state_destroy     (Pop3State              *state);
 static void inc_start                  (IncProgressDialog      *inc_dialog);
 static IncState inc_pop3_session_do    (IncSession             *session);
-static gint pop3_automaton_terminate   (gint                    source,
+static gint pop3_automaton_terminate   (SockInfo               *source,
                                         Automaton              *atm);
 
 static GHashTable *inc_get_uidl_table  (PrefsAccount           *ac_prefs);
@@ -86,6 +98,11 @@ static void inc_write_uidl_list              (Pop3State              *state);
 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,
@@ -95,6 +112,10 @@ static gint inc_spool                       (void);
 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;
@@ -114,6 +135,7 @@ static void inc_finished(MainWindow *mainwin)
 
 void inc_mail(MainWindow *mainwin)
 {
+       inc_autocheck_timer_remove();
        summary_write_cache(mainwin->summaryview);
 
        if (prefs_common.use_extinc && prefs_common.extinc_path) {
@@ -122,6 +144,7 @@ void inc_mail(MainWindow *mainwin)
                /* external incorporating program */
                if ((pid = fork()) < 0) {
                        perror("fork");
+                       inc_autocheck_timer_set();
                        return;
                }
 
@@ -139,19 +162,23 @@ void inc_mail(MainWindow *mainwin)
                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)
 {
        IncProgressDialog *inc_dialog;
        IncSession *session;
+       gchar *text[3];
 
        session = inc_session_new(account);
        if (!session) return;
@@ -161,6 +188,11 @@ static void inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
        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);
+
        inc_start(inc_dialog);
 }
 
@@ -169,12 +201,16 @@ void inc_all_account_mail(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;
@@ -187,19 +223,30 @@ void inc_all_account_mail(MainWindow *mainwin)
                }
        }
 
-       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_dialog->mainwin = mainwin;
        for (list = queue_list; list != NULL; list = list->next) {
                IncSession *session = list->data;
+               gchar *text[3];
+
                session->data = inc_dialog;
+
+               text[0] = NULL;
+               text[1] = session->pop3_state->ac_prefs->account_name;
+               text[2] = _("Standby");
+               gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
        }
 
        inc_start(inc_dialog);
 
        inc_finished(mainwin);
+       inc_autocheck_timer_set();
 }
 
 static IncProgressDialog *inc_progress_dialog_create(void)
@@ -216,11 +263,27 @@ 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_now(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);
+
+       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;
@@ -288,6 +351,8 @@ static Pop3State *inc_pop3_state_new(PrefsAccount *account)
 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);
@@ -308,8 +373,10 @@ static void inc_pop3_state_destroy(Pop3State *state)
 static void inc_start(IncProgressDialog *inc_dialog)
 {
        IncSession *session;
+       GtkCList *clist = GTK_CLIST(inc_dialog->dialog->clist);
        Pop3State *pop3_state;
        IncState inc_state;
+       gint num = 0;
 
        while (inc_dialog->queue_list != NULL) {
                session = inc_dialog->queue_list->data;
@@ -317,6 +384,8 @@ static void inc_start(IncProgressDialog *inc_dialog)
 
                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 =
@@ -336,8 +405,11 @@ static void inc_start(IncProgressDialog *inc_dialog)
                        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;
@@ -349,20 +421,39 @@ static void inc_start(IncProgressDialog *inc_dialog)
                        }
                }
 
+               gtk_clist_set_pixmap(clist, num, 0, currentxpm, currentxpmmask);
+               gtk_clist_set_text(clist, num, 2, _("Retrieving"));
+
                /* begin POP3 session */
                inc_state = inc_pop3_session_do(session);
 
+               if (inc_state == INC_SUCCESS || inc_state == INC_CANCEL) {
+                       gtk_clist_set_pixmap(clist, num, 0, okxpm, okxpmmask);
+                       gtk_clist_set_text(clist, num, 2, _("Done"));
+               } else {
+                       gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
+                       gtk_clist_set_text(clist, num, 2, _("Error"));
+               }
+
                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);
 
@@ -382,6 +473,8 @@ static void inc_start(IncProgressDialog *inc_dialog)
                inc_session_destroy(session);
                inc_dialog->queue_list =
                        g_list_remove(inc_dialog->queue_list, session);
+
+               num++;
        }
 
        while (inc_dialog->queue_list != NULL) {
@@ -394,6 +487,7 @@ static void inc_start(IncProgressDialog *inc_dialog)
        inc_progress_dialog_destroy(inc_dialog);
 }
 
+
 static IncState inc_pop3_session_do(IncSession *session)
 {
        Pop3State *pop3_state = session->pop3_state;
@@ -404,7 +498,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        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,
@@ -412,6 +506,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                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
@@ -443,8 +538,13 @@ static IncState inc_pop3_session_do(IncSession *session)
        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);
@@ -455,43 +555,122 @@ static IncState inc_pop3_session_do(IncSession *session)
 #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);
-               pop3_automaton_terminate(-1, atm);
+               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);
 
-               return pop3_state->inc_state;
+               return INC_ERROR;
        }
 
+       /* :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->pop_ssl) {
+               X509 *server_cert;
+
+               if(ssl_ctx == NULL) {
+                       log_warning(_("SSL not available\n"));
+
+                       pop3_automaton_terminate(NULL, atm);
+                       automaton_destroy(atm);
+
+                       return INC_ERROR;
+               }
+
+               sockinfo->ssl = SSL_new(ssl_ctx);
+               if(sockinfo->ssl == NULL) {
+                       log_warning(_("Error creating ssl context\n"));
+
+                       pop3_automaton_terminate(NULL, atm);
+                       automaton_destroy(atm);
+
+                       return INC_ERROR;
+               }
+               SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+               if(SSL_connect(sockinfo->ssl) == -1) {
+                       log_warning(_("SSL connect failed\n"));
+
+                       pop3_automaton_terminate(NULL, atm);
+                       automaton_destroy(atm);
+
+                       return INC_ERROR;
+               }
+               
+               /* Get the cipher */
+
+               log_print(_("SSL connection using %s\n"), SSL_get_cipher(sockinfo->ssl));
+  
+               /* Get server's certificate (note: beware of dynamic allocation) */
+
+               if((server_cert = SSL_get_peer_certificate(sockinfo->ssl)) != NULL) {
+                       char *str;
+                       
+                       log_print(_("Server certificate:\n"));
+  
+                       if((str = X509_NAME_oneline(X509_get_subject_name (server_cert),0,0)) != NULL) {
+                               log_print(_("  Subject: %s\n"), str);
+                               free(str);
+                       }
+                       
+                       if((str = X509_NAME_oneline(X509_get_issuer_name  (server_cert),0,0)) != NULL) {
+                               log_print(_("  Issuer: %s\n"), str);
+                               free(str);
+                       }
+
+                       X509_free(server_cert);
+               }
+       } 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);
 #else
-       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);
 #endif
 
        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
+       if(sockinfo->ssl) {
+               SSL_free(sockinfo->ssl);
+       }
 #endif
-       sock_sockinfo_free(sockinfo);
        automaton_destroy(atm);
 
        return pop3_state->inc_state;
 }
 
-static gint pop3_automaton_terminate(gint source, Automaton *atm)
+static gint pop3_automaton_terminate(SockInfo *source, Automaton *atm)
 {
        if (atm->tag > 0) {
                gdk_input_remove(atm->tag);
@@ -501,7 +680,7 @@ static gint pop3_automaton_terminate(gint source, Automaton *atm)
                gtk_timeout_remove(atm->timeout_tag);
                atm->timeout_tag = 0;
        }
-       if (source > 0) {
+       if (source) {
                sock_close(source);
                gtk_main_quit();
        }
@@ -579,24 +758,29 @@ static gint connection_check_cb(Automaton *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;
@@ -604,6 +788,31 @@ static gint connection_check_cb(Automaton *atm)
 }
 #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;
+
+       cur_total = state->cur_total_bytes + read_bytes;
+       if (cur_total > state->total_bytes)
+               cur_total = state->total_bytes;
+
+       g_snprintf(buf, sizeof(buf),
+                  _("Retrieving message (%d / %d) (%d / %d bytes)"),
+                  state->cur_msg, state->count,
+                  cur_total, state->total_bytes);
+       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];
@@ -619,25 +828,39 @@ 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, _("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:
                g_snprintf(buf, sizeof(buf),
-                          _("Retrieving message (%d / %d)"),
-                          state->cur_msg, state->count);
+                          _("Retrieving message (%d / %d) (%d / %d bytes)"),
+                          state->cur_msg, state->count,
+                          state->cur_total_bytes, state->total_bytes);
                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:
@@ -648,6 +871,7 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                progress_dialog_set_label(dialog, _("Quitting"));
                break;
        default:
+               break;
        }
 }
 
@@ -656,6 +880,7 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
        FolderItem *inbox;
        FolderItem *dropfolder;
        gint val;
+       gint msgnum;
 
        if (state->ac_prefs->inbox) {
                inbox = folder_find_item_from_path(state->ac_prefs->inbox);
@@ -668,16 +893,22 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
                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));
@@ -687,12 +918,19 @@ gint inc_drop_message(const gchar *file, Pop3State *state)
                                    GINT_TO_POINTER(1));
        }
 
-       if (folder_item_add_msg(dropfolder, file) < 0) {
+       if ((msgnum = folder_item_add_msg(dropfolder, file, TRUE)) < 0) {
                unlink(file);
                return -1;
        }
 
-       unlink(file);
+       if (prefs_filtering != NULL) {
+               /* new filtering */
+               if (state->ac_prefs->filter_on_recv) {
+                       filter_message(prefs_filtering, dropfolder, msgnum,
+                                      state->folder_table);
+               }
+       }
+
        return 0;
 }
 
@@ -700,12 +938,15 @@ static void inc_put_error(IncState istate)
 {
        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;
        }
 }
 
@@ -719,13 +960,13 @@ static void inc_cancel(GtkWidget *widget, gpointer data)
        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
 
        session->pop3_state->inc_state = INC_CANCEL;
-       pop3_automaton_terminate(sockinfo->sock, session->atm);
+       pop3_automaton_terminate(sockinfo, session->atm);
 }
 
 static gint inc_spool(void)
@@ -743,11 +984,43 @@ static gint inc_spool(void)
        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);
@@ -762,6 +1035,9 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        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;
 
@@ -777,6 +1053,8 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        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);
@@ -787,3 +1065,41 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
 
        return msgs;
 }
+
+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;
+}