sync with Hiroyuki's 0.5.0claws2-3

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 1f15ff8c5036bdd5df6679c0b65676f5dbe7da9c..85791abe09469ab78dae371bbcb37cceee95cbfe 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -99,6 +99,7 @@ static gint connection_check_cb               (Automaton      *atm);
 #endif
 
 static void inc_pop3_recv_func         (SockInfo       *sock,
+                                        gint            count,
                                         gint            read_bytes,
                                         gpointer        data);
 
@@ -262,18 +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(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;
@@ -395,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;
@@ -424,7 +437,10 @@ static void inc_start(IncProgressDialog *inc_dialog)
 
                if (pop3_state->error_val == PS_AUTHFAIL) {
                        if(!prefs_common.noerrorpanel) {
-                               manage_window_focus_in(inc_dialog->dialog->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->dialog->window, NULL, NULL);
+                               }
                                alertpanel_error
                                        (_("Authorization for %s on %s failed"),
                                         pop3_state->user,
@@ -433,8 +449,11 @@ static void inc_start(IncProgressDialog *inc_dialog)
                }
 
                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);
 
@@ -519,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);
@@ -536,7 +560,10 @@ static IncState inc_pop3_session_do(IncSession *session)
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            server, port);
                if(!prefs_common.noerrorpanel) {
-                       manage_window_focus_in(inc_dialog->dialog->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->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);
@@ -552,6 +579,66 @@ static IncState inc_pop3_session_do(IncSession *session)
        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
@@ -568,7 +655,15 @@ static IncState inc_pop3_session_do(IncSession *session)
        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
        automaton_destroy(atm);
 
@@ -663,7 +758,7 @@ 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) {
@@ -671,7 +766,10 @@ static gint connection_check_cb(Automaton *atm)
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            sockinfo->hostname, sockinfo->port);
                if(!prefs_common.noerrorpanel) {
-                       manage_window_focus_in(inc_dialog->dialog->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->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);
@@ -690,7 +788,8 @@ static gint connection_check_cb(Automaton *atm)
 }
 #endif
 
-static void inc_pop3_recv_func(SockInfo *sock, gint read_bytes, gpointer data)
+static void inc_pop3_recv_func(SockInfo *sock, gint count, gint read_bytes,
+                              gpointer data)
 {
        gchar buf[MSGBUFSIZE];
        IncSession *session = (IncSession *)data;
@@ -772,6 +871,7 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
                progress_dialog_set_label(dialog, _("Quitting"));
                break;
        default:
+               break;
        }
 }
 
@@ -846,6 +946,7 @@ static void inc_put_error(IncState istate)
                alertpanel_error(_("No disk space left."));
                break;
        default:
+               break;
        }
 }
 
@@ -859,7 +960,7 @@ 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
@@ -952,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);