removed local account without SMTP server - added option to use mail command

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 75907753f803a35d042fad83ad2e29ddce482364..db44964e9f9f4ad8325cbb7c8053e29b28878d43 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -97,6 +97,10 @@ 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            read_len,
+                                        gpointer        data);
+
 static void inc_put_error              (IncState        istate);
 
 static void inc_cancel                 (GtkWidget      *widget,
@@ -106,6 +110,7 @@ static gint inc_spool                       (void);
 static gint get_spool                  (FolderItem     *dest,
                                         const gchar    *mbox);
 
+static void inc_all_spool(void);
 
 static void inc_finished(MainWindow *mainwin)
 {
@@ -151,8 +156,10 @@ 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);
        }
@@ -320,6 +327,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);
@@ -452,7 +461,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,
@@ -460,6 +469,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
@@ -522,6 +532,8 @@ static IncState inc_pop3_session_do(IncSession *session)
        pop3_state->sockinfo = sockinfo;
        atm->help_sock = sockinfo;
 
+       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);
@@ -533,6 +545,8 @@ static IncState inc_pop3_session_do(IncSession *session)
 
        gtk_main();
 
+       recv_set_ui_func(NULL, NULL);
+
 #if USE_THREADS
        //pthread_join(sockinfo->connect_thr, NULL);
 #endif
@@ -654,6 +668,31 @@ static gint connection_check_cb(Automaton *atm)
 }
 #endif
 
+static void inc_pop3_recv_func(SockInfo *sock, gint read_len, 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;
+
+       state->cur_msg_bytes += read_len;
+       cur_total = state->cur_total_bytes + state->cur_msg_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];
@@ -683,11 +722,14 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
        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:
@@ -793,11 +835,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[256] = "/tmp/tmpmboxXXXXXX";
        GHashTable *folder_table = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -812,6 +886,9 @@ 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;
+
        if (copy_mbox(mbox, tmp_mbox) < 0)
                return -1;
 
@@ -836,4 +913,4 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        }
 
        return msgs;
-}
\ No newline at end of file
+}