added scrolled window for list in progressdialog

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 133d3c2d0d28c77ffaabd4683152efedea2e6830..4565611536d9a92c2df94b2fa79d091432753a0c 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -60,6 +60,7 @@
 #include "filter.h"
 #include "automaton.h"
 #include "folder.h"
+#include "filtering.h"
 
 #include "pixmaps/continue.xpm"
 #include "pixmaps/complete.xpm"
@@ -142,7 +143,7 @@ void inc_mail(MainWindow *mainwin)
                /* external incorporating program */
                if ((pid = fork()) < 0) {
                        perror("fork");
-                       inc_autocheck_timer_set();                      
+                       inc_autocheck_timer_set();
                        return;
                }
 
@@ -169,7 +170,7 @@ void inc_mail(MainWindow *mainwin)
        }
 
        inc_finished(mainwin);
-       inc_autocheck_timer_set();      
+       inc_autocheck_timer_set();
 }
 
 static void inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
@@ -208,7 +209,7 @@ void inc_all_account_mail(MainWindow *mainwin)
        if (!list) {
                inc_autocheck_timer_set();
                return;
-       }               
+       }
 
        for (; list != NULL; list = list->next) {
                IncSession *session;
@@ -224,7 +225,7 @@ void inc_all_account_mail(MainWindow *mainwin)
        if (!queue_list) {
                inc_autocheck_timer_set();
                return;
-       }       
+       }
 
        inc_dialog = inc_progress_dialog_create();
        inc_dialog->queue_list = queue_list;
@@ -373,6 +374,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 =
@@ -661,19 +664,19 @@ static gint connection_check_cb(Automaton *atm)
        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);
+               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;
@@ -720,7 +723,7 @@ 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:
@@ -771,6 +774,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);
@@ -783,16 +787,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));
@@ -802,12 +812,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;
 }
 
@@ -894,7 +911,7 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
 {
        gint msgs, size;
        gint lockfd;
-       gchar tmp_mbox[256] = "/tmp/tmpmboxXXXXXX";
+       gchar tmp_mbox[MAXPATHLEN + 1];
        GHashTable *folder_table = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -909,8 +926,8 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0)
                return -1;
 
-       if (mktemp(tmp_mbox) == NULL)
-               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;