sync with sylpheed 0.6.0cvs4

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 4ce3325ba9b3fcc9332f215b60b0dc857115d363..b86a174c7b8a83f8ebcaf272738974451a43f129 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -48,6 +48,7 @@
 #include "account.h"
 #include "procmsg.h"
 #include "socket.h"
+#include "ssl.h"
 #include "pop.h"
 #include "recv.h"
 #include "mbox.h"
@@ -67,12 +68,14 @@
 #include "pixmaps/complete.xpm"
 #include "pixmaps/error.xpm"
 
-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
 
@@ -115,8 +118,8 @@ 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_autocheck_timer_set_interval   (guint           interval);
+static gint inc_autocheck_func                 (gpointer        data);
 
 /**
  * inc_finished:
@@ -169,6 +172,8 @@ void inc_mail(MainWindow *mainwin)
 {
        gint new_msgs = 0;
 
+       if (inc_lock_count) return;
+
        inc_autocheck_timer_remove();
        summary_write_cache(mainwin->summaryview);
        main_window_lock(mainwin);
@@ -239,6 +244,8 @@ void inc_all_account_mail(MainWindow *mainwin)
        IncProgressDialog *inc_dialog;
        gint new_msgs = 0;
 
+       if (inc_lock_count) return;
+
        inc_autocheck_timer_remove();
        summary_write_cache(mainwin->summaryview);
        main_window_lock(mainwin);
@@ -431,7 +438,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 
                inc_progress_dialog_clear(inc_dialog);
 
-               gtk_clist_moveto(clist, num, 0, 1.0, 0.0);
+               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)
@@ -561,7 +568,6 @@ static gint inc_start(IncProgressDialog *inc_dialog)
        return new_msgs;
 }
 
-
 static IncState inc_pop3_session_do(IncSession *session)
 {
        Pop3State *pop3_state = session->pop3_state;
@@ -614,7 +620,8 @@ static IncState inc_pop3_session_do(IncSession *session)
        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;
@@ -645,28 +652,22 @@ static IncState inc_pop3_session_do(IncSession *session)
                }
                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);
 
@@ -685,13 +686,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        recv_set_ui_func(NULL, NULL);
 
 #if USE_THREADS
-/*
-       pthread_join(sockinfo->connect_thr, NULL);
-*/     
-#endif
-
-#if USE_SSL
-       ssl_done_socket(sockinfo);
+       //pthread_join(sockinfo->connect_thr, NULL);
 #endif
        automaton_destroy(atm);
 
@@ -862,7 +857,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, _("Authenticating..."));
                break;
        case POP3_GETRANGE_STAT_SEND:
        case POP3_GETRANGE_STAT_RECV:
@@ -1105,6 +1100,17 @@ static gint get_spool(FolderItem *dest, const gchar *mbox)
        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;
 
@@ -1114,21 +1120,26 @@ void inc_autocheck_timer_init(MainWindow *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) {
                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;
        }
@@ -1138,6 +1149,12 @@ static gint inc_autocheck_func(gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
+       if (inc_lock_count) {
+               debug_print("autocheck is locked.\n");
+               inc_autocheck_timer_set_interval(1000);
+               return FALSE;
+       }
+
        inc_all_account_mail(mainwin);
 
        return FALSE;