2006-06-29 [colin] 2.3.1cvs40

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6d476b1a0104a7a99cc6cb19f26c8a700b067fa2..1381e292d94a4a8ddbf33e9bccead720d00bfc1b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -334,8 +334,8 @@ int main(int argc, char *argv[])
        if (cmd.exit)
                return 0;
 #endif
-       g_thread_init(NULL);
-       /* gdk_threads_init(); */
+       if (!g_thread_supported())
+               g_thread_init(NULL);
 
        gtk_set_locale();
        gtk_init(&argc, &argv);
@@ -447,6 +447,7 @@ int main(int argc, char *argv[])
                
        mainwin = main_window_create
                (prefs_common.sep_folder | prefs_common.sep_msg << 1);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
        gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
@@ -480,7 +481,7 @@ int main(int argc, char *argv[])
        main_window_popup(mainwin);
 
 #ifdef HAVE_LIBETPAN
-       imap_main_init();
+       imap_main_init(prefs_common.skip_ssl_cert_check);
 #endif 
        account_set_missing_folder();
        folder_set_missing_folders();
@@ -505,10 +506,6 @@ int main(int argc, char *argv[])
 
        inc_autocheck_timer_init(mainwin);
 
-       /* ignore SIGPIPE signal for preventing sudden death of program */
-#ifdef G_OS_UNIX
-       signal(SIGPIPE, SIG_IGN);
-#endif
        if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
                main_window_toggle_work_offline(mainwin, TRUE, FALSE);
        }
@@ -539,12 +536,17 @@ int main(int argc, char *argv[])
        }
        
        if (plugin_get_unloaded_list() != NULL) {
+               main_window_cursor_normal(mainwin);
                alertpanel_warning(_("Some plugin(s) failed to load. "
                                     "Check the Plugins configuration "
                                     "for more information."));
+               main_window_cursor_wait(mainwin);
        }
-       
+
+       plugin_load_standard_plugins ();
+       
        if (!folder_have_mailbox()) {
+               main_window_cursor_normal(mainwin);
                alertpanel_error(_("Sylpheed-Claws has detected a configured "
                                   "mailbox, but could not load it. It is "
                                   "probably provided by an out-of-date "
@@ -601,10 +603,18 @@ int main(int argc, char *argv[])
 
 static void save_all_caches(FolderItem *item, gpointer data)
 {
+       gint free_caches = GPOINTER_TO_INT(data);
        if (!item->cache) {
                return;
        }
-       folder_item_write_cache(item);
+
+       if (item->opened)
+               folder_item_close(item);
+       
+       if (free_caches)
+               folder_item_free_cache(item, TRUE);
+       else
+               folder_item_write_cache(item);
 }
 
 static void exit_sylpheed(MainWindow *mainwin)
@@ -628,7 +638,7 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        /* save all state before exiting */
        folder_write_list();
-       folder_func_to_all_folders(save_all_caches, NULL);
+       folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(1));
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
@@ -917,7 +927,7 @@ gboolean clean_quit(gpointer data)
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
-
+       
        if (compose_get_compose_list()) {
                gint val = alertpanel(_("Really quit?"),
                               _("Composing message exists."),
@@ -945,7 +955,8 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        }
 
        sock_cleanup();
-
+       if (folderview_get_selected_item(mainwin->folderview))
+               folder_item_close(folderview_get_selected_item(mainwin->folderview));
        gtk_main_quit();
 }
 
@@ -1213,26 +1224,42 @@ static void open_compose_new(const gchar *address, GPtrArray *attach_files)
 static void send_queue(void)
 {
        GList *list;
-
+       gchar *errstr = NULL;
        for (list = folder_get_list(); list != NULL; list = list->next) {
                Folder *folder = list->data;
 
                if (folder->queue) {
                        gint res = procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg);
+                               (folder->queue, prefs_common.savemsg,
+                               &errstr);
 
-                       if (res < 0) {
-                               alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       }
                        if (res) {
                                folder_item_scan(folder->queue);
                        }
                }
        }
+       if (errstr) {
+               gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                               "while sending queued messages:\n%s"), errstr);
+               g_free(errstr);
+               alertpanel_error_log(tmp);
+               g_free(tmp);
+       } else {
+               alertpanel_error_log("Some errors occurred "
+                               "while sending queued messages.");
+       }
 }
 
 static void quit_signal_handler(int sig)
 {
+#ifdef SIGPIPE
+       if (sig == SIGPIPE) {
+               debug_print("caugth SIGPIPE, maybe X closing!\n");
+               folder_write_list();
+               folder_func_to_all_folders(save_all_caches, GINT_TO_POINTER(0));
+               return; 
+       }
+#endif
        debug_print("Quitting on signal %d\n", sig);
 
        g_timeout_add(0, clean_quit, NULL);
@@ -1255,6 +1282,9 @@ static void install_basic_sighandlers()
 #ifdef SIGHUP
        sigaddset(&mask, SIGHUP);
 #endif
+#ifdef SIGPIPE
+       sigaddset(&mask, SIGPIPE);
+#endif
 
        act.sa_handler = quit_signal_handler;
        act.sa_mask    = mask;
@@ -1269,6 +1299,9 @@ static void install_basic_sighandlers()
 #ifdef SIGHUP
        sigaction(SIGHUP, &act, 0);
 #endif 
+#ifdef SIGPIPE
+       sigaction(SIGPIPE, &act, 0);
+#endif 
 
        sigprocmask(SIG_UNBLOCK, &mask, 0);
 #endif /* !G_OS_WIN32 */