2007-01-18 [colin] 2.7.1cvs31
[claws.git] / src / main.c
index 0869b66d22616ace0e0ea6bfdc89b6ea914d50cb..f0d7dd4b32ae192f4e0181460b41b2b228e82600 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #ifdef G_OS_UNIX
 #  include <signal.h>
 #endif
+#ifdef HAVE_LIBSM
+#include <X11/SM/SMlib.h>
+#include <fcntl.h>
+#endif
+
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
 # define SN_API_NOT_YET_FROZEN
@@ -46,7 +51,7 @@
 # include <gdk/gdkx.h>
 #endif
 
-#include "sylpheed.h"
+#include "claws.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
 
 #include "crash.h"
 
+#include "timing.h"
+
 gchar *prog_version;
-#ifdef CRASH_DIALOG
 gchar *argv0;
-#endif
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 static SnLauncheeContext *sn_context = NULL;
@@ -139,6 +144,9 @@ static struct RemoteCmd {
        int online_mode;
        gchar   *crash_params;
        gboolean exit;
+       gboolean subscribe;
+       const gchar *subscribe_uri;
+       const gchar *target;
 } cmd;
 
 static void parse_cmd_opt(int argc, char *argv[]);
@@ -149,9 +157,7 @@ static gint lock_socket_remove              (void);
 static void lock_socket_input_cb       (gpointer          data,
                                         gint              source,
                                         GdkInputCondition condition);
-#ifndef CLAWS                                   
-static 
-#endif
+
 gchar *get_socket_name         (void);
 
 
@@ -162,7 +168,7 @@ static void send_queue                      (void);
 static void initial_processing         (FolderItem *item, gpointer data);
 static void quit_signal_handler         (int sig);
 static void install_basic_sighandlers   (void);
-static void exit_sylpheed              (MainWindow *mainwin);
+static void exit_claws                 (MainWindow *mainwin);
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
 { \
@@ -180,6 +186,7 @@ static void exit_sylpheed           (MainWindow *mainwin);
 }
 
 static MainWindow *static_mainwindow;
+static gboolean emergency_exit = FALSE;
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 static void sn_error_trap_push(SnDisplay *display, Display *xdisplay)
@@ -214,22 +221,23 @@ static void startup_notification_complete(gboolean with_window)
        sn_context = sn_launchee_context_new_from_environment(sn_display,
                                                 DefaultScreen(xdisplay));
 
-       if (sn_context != NULL)
-       {
+       if (sn_context != NULL) {
                sn_launchee_context_complete(sn_context);
                sn_launchee_context_unref(sn_context);
                sn_display_unref(sn_display);
        }
-       if (with_window)
+       if (with_window) {
                gtk_widget_destroy(hack);
+       }
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-void sylpheed_gtk_idle(void) 
+void claws_gtk_idle(void) 
 {
-       while(gtk_events_pending())
+       while(gtk_events_pending()) {
                gtk_main_iteration();
-       usleep(50000);
+       }
+       g_usleep(50000);
 }
 
 gboolean defer_check_all(void *data)
@@ -249,29 +257,301 @@ gboolean defer_check(void *data)
        return FALSE;
 }
 
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+static gboolean defer_jump(void *data)
+{
+       mainwindow_jump_to(data);
+       return FALSE;
+}
+
+static void chk_update_val(GtkWidget *widget, gpointer data)
+{
+        gboolean *val = (gboolean *)data;
+       *val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir, const gchar *oldversion)
 {
-       gchar *message = g_strdup_printf(_("Configuration for Sylpheed-Claws %s found.\n"
-                        "Do you want to migrate this configuration?"),
-                        !strcmp(old_cfg_dir, OLD_GTK1_RC_DIR)?
-                               _("1.0.5 or previous"):_("1.9.15 or previous"));
+       gchar *message = g_strdup_printf(_("Configuration for %s (or previous) found.\n"
+                        "Do you want to migrate this configuration?"), oldversion);
        gint r = 0;
        GtkWidget *window = NULL;
-       if (alertpanel(_("Migration of configuration"),
-                      message,
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+       GtkWidget *keep_backup_chk;
+       GtkTooltips *tips = gtk_tooltips_new();
+       gboolean backup = TRUE;
+
+       keep_backup_chk = gtk_check_button_new_with_label (_("Keep old configuration"));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keep_backup_chk), TRUE);
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), keep_backup_chk,
+                            _("Keeping a backup will allow you to go back to an "
+                              "older version, but may take a while if you have "
+                              "cached IMAP or News data, and will take some extra "
+                              "room on your disk."),
+                            NULL);
+
+       g_signal_connect(G_OBJECT(keep_backup_chk), "toggled", 
+                       G_CALLBACK(chk_update_val), &backup);
+
+       if (alertpanel_full(_("Migration of configuration"), message,
+                       GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL, FALSE,
+                       keep_backup_chk, ALERT_QUESTION, G_ALERTDEFAULT) != G_ALERTALTERNATE) {
                return FALSE;
+       }
        
-       window = label_window_create(_("Copying configuration..."));
-       GTK_EVENTS_FLUSH();
-       r = copy_dir(old_cfg_dir, new_cfg_dir);
-       gtk_widget_destroy(window);
-       if (r != 0) {
-               alertpanel_error(_("Migration failed!"));
+       /* we can either do a fast migration requiring not any extra disk
+        * space, or a slow one that copies the old configuration and leaves
+        * it in place. */
+       if (backup) {
+backup_mode:
+               window = label_window_create(_("Copying configuration... This may take a while..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = copy_dir(old_cfg_dir, new_cfg_dir);
+               gtk_widget_destroy(window);
+               
+               /* if copy failed, we'll remove the partially copied
+                * new directory */
+               if (r != 0) {
+                       alertpanel_error(_("Migration failed!"));
+                       remove_dir_recursive(new_cfg_dir);
+               } else {
+                       if (!backup) {
+                               /* fast mode failed, but we don't want backup */
+                               remove_dir_recursive(old_cfg_dir);
+                       }
+               }
+       } else {
+               window = label_window_create(_("Migrating configuration..."));
+               GTK_EVENTS_FLUSH();
+               
+               r = g_rename(old_cfg_dir, new_cfg_dir);
+               gtk_widget_destroy(window);
+               
+               /* if g_rename failed, we'll try to copy */
+               if (r != 0) {
+                       FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+                       goto backup_mode;
+               }
        }
        return (r == 0);
 }
 
+static void migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
+{
+       FILE *oldfp, *newfp;
+       gchar *plugin_path, *old_plugin_path, *new_plugin_path;
+       gchar buf[BUFFSIZE];
+       oldfp = g_fopen(old_rc, "r");
+       if (!oldfp)
+               return;
+       newfp = g_fopen(new_rc, "w");
+       if (!newfp) {
+               fclose(oldfp);
+               return;
+       }
+       
+       plugin_path = g_strdup(get_plugin_dir());
+       new_plugin_path = g_strdup(plugin_path);
+       
+       if (strstr(plugin_path, "/claws-mail/")) {
+               gchar *end = g_strdup(strstr(plugin_path, "/claws-mail/")+strlen("/claws-mail/"));
+               *(strstr(plugin_path, "/claws-mail/")) = '\0';
+               old_plugin_path = g_strconcat(plugin_path, "/sylpheed-claws/", end, NULL);
+               g_free(end);
+       } else {
+               old_plugin_path = g_strdup(new_plugin_path);
+       }
+       debug_print("replacing %s with %s\n", old_plugin_path, new_plugin_path);
+       while (fgets(buf, sizeof(buf), oldfp)) {
+               if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
+                       fputs(buf, newfp);
+               } else {
+                       debug_print("->replacing %s", buf);
+                       debug_print("  with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
+                       fputs(new_plugin_path, newfp);
+                       fputs(buf+strlen(old_plugin_path), newfp);
+               }
+       }
+       g_free(plugin_path);
+       g_free(new_plugin_path);
+       g_free(old_plugin_path);
+       fclose(oldfp);
+       fclose(newfp);
+}
+
+#ifdef HAVE_LIBSM
+static void
+sc_client_set_value (MainWindow *mainwin,
+                 gchar       *name,
+                 char        *type,
+                 int          num_vals,
+                 SmPropValue *vals)
+{
+       SmProp *proplist[1];
+       SmProp prop;
+
+       prop.name = name;
+       prop.type = type;
+       prop.num_vals = num_vals;
+       prop.vals = vals;
+
+       proplist[0]= &prop;
+       if (mainwin->smc_conn)
+               SmcSetProperties ((SmcConn) mainwin->smc_conn, 1, proplist);
+}
+
+static void sc_die_callback (SmcConn smc_conn, SmPointer client_data)
+{
+       clean_quit(NULL);
+}
+
+static void sc_save_complete_callback(SmcConn smc_conn, SmPointer client_data)
+{
+}
+
+static void sc_shutdown_cancelled_callback (SmcConn smc_conn, SmPointer client_data)
+{
+       MainWindow *mainwin = (MainWindow *)client_data;
+       if (mainwin->smc_conn)
+               SmcSaveYourselfDone ((SmcConn) mainwin->smc_conn, TRUE);
+}
+
+static void sc_save_yourself_callback (SmcConn   smc_conn,
+                              SmPointer client_data,
+                              int       save_style,
+                              gboolean  shutdown,
+                              int       interact_style,
+                              gboolean  fast) {
+
+       MainWindow *mainwin = (MainWindow *)client_data;
+       if (mainwin->smc_conn)
+               SmcSaveYourselfDone ((SmcConn) mainwin->smc_conn, TRUE);
+}
+
+static IceIOErrorHandler sc_ice_installed_handler;
+
+static void sc_ice_io_error_handler (IceConn connection)
+{
+       if (sc_ice_installed_handler)
+               (*sc_ice_installed_handler) (connection);
+}
+static gboolean sc_process_ice_messages (GIOChannel   *source,
+                     GIOCondition  condition,
+                     gpointer      data)
+{
+       IceConn connection = (IceConn) data;
+       IceProcessMessagesStatus status;
+
+       status = IceProcessMessages (connection, NULL, NULL);
+
+       if (status == IceProcessMessagesIOError) {
+               IcePointer context = IceGetConnectionContext (connection);
+
+               if (context && GTK_IS_OBJECT (context)) {
+               guint disconnect_id = g_signal_lookup ("disconnect", G_OBJECT_TYPE (context));
+
+               if (disconnect_id > 0)
+                       g_signal_emit (context, disconnect_id, 0);
+               } else {
+                       IceSetShutdownNegotiation (connection, False);
+                       IceCloseConnection (connection);
+               }
+       }
+
+       return TRUE;
+}
+
+static void new_ice_connection (IceConn connection, IcePointer client_data, Bool opening,
+                   IcePointer *watch_data)
+{
+       guint input_id;
+
+       if (opening) {
+               GIOChannel *channel;
+               /* Make sure we don't pass on these file descriptors to any
+               exec'ed children */
+               fcntl(IceConnectionNumber(connection),F_SETFD,
+               fcntl(IceConnectionNumber(connection),F_GETFD,0) | FD_CLOEXEC);
+
+               channel = g_io_channel_unix_new (IceConnectionNumber (connection));
+               input_id = g_io_add_watch (channel,
+               G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
+               sc_process_ice_messages,
+               connection);
+               g_io_channel_unref (channel);
+
+               *watch_data = (IcePointer) GUINT_TO_POINTER (input_id);
+       } else {
+               input_id = GPOINTER_TO_UINT ((gpointer) *watch_data);
+               g_source_remove (input_id);
+       }
+}
+
+static void sc_session_manager_connect(MainWindow *mainwin)
+{
+       static gboolean connected = FALSE;
+       SmcCallbacks      callbacks;
+       gchar            *client_id;
+       IceIOErrorHandler default_handler;
+
+       if (connected)
+               return;
+       connected = TRUE;
+
+
+       sc_ice_installed_handler = IceSetIOErrorHandler (NULL);
+       default_handler = IceSetIOErrorHandler (sc_ice_io_error_handler);
+
+       if (sc_ice_installed_handler == default_handler)
+               sc_ice_installed_handler = NULL;
+
+       IceAddConnectionWatch (new_ice_connection, NULL);
+      
+      
+       callbacks.save_yourself.callback      = sc_save_yourself_callback;
+       callbacks.die.callback                = sc_die_callback;
+       callbacks.save_complete.callback      = sc_save_complete_callback;
+       callbacks.shutdown_cancelled.callback = sc_shutdown_cancelled_callback;
+
+       callbacks.save_yourself.client_data =
+               callbacks.die.client_data =
+               callbacks.save_complete.client_data =
+               callbacks.shutdown_cancelled.client_data = (SmPointer) mainwin;
+       if (g_getenv ("SESSION_MANAGER")) {
+               gchar error_string_ret[256] = "";
+
+               mainwin->smc_conn = (gpointer)
+                       SmcOpenConnection (NULL, mainwin,
+                               SmProtoMajor, SmProtoMinor,
+                               SmcSaveYourselfProcMask | SmcDieProcMask |
+                               SmcSaveCompleteProcMask |
+                               SmcShutdownCancelledProcMask,
+                               &callbacks,
+                               NULL, &client_id,
+                               256, error_string_ret);
+
+               if (error_string_ret[0] || mainwin->smc_conn == NULL)
+                       g_warning ("While connecting to session manager:\n%s.",
+                               error_string_ret);
+               else {
+                       SmPropValue *vals;
+                       vals = g_new (SmPropValue, 1);
+                       vals[0].length = strlen(argv0);
+                       vals[0].value = argv0;
+                       sc_client_set_value (mainwin, SmCloneCommand, SmLISTofARRAY8, 1, vals);
+                       sc_client_set_value (mainwin, SmRestartCommand, SmLISTofARRAY8, 1, vals);
+                       sc_client_set_value (mainwin, SmProgram, SmARRAY8, 1, vals);
+
+                       vals[0].length = strlen(g_get_user_name()?g_get_user_name():"");
+                       vals[0].value = g_strdup(g_get_user_name()?g_get_user_name():"");
+                       sc_client_set_value (mainwin, SmUserID, SmARRAY8, 1, vals);
+               }
+       }
+}
+#endif
+
+static gboolean sc_exiting = FALSE;
+static gboolean sc_starting = FALSE;
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
@@ -279,15 +559,20 @@ int main(int argc, char *argv[])
        FolderView *folderview;
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
+       gint num_folder_class = 0;
+       gboolean asked_for_migration = FALSE;
 
-       if (!sylpheed_init(&argc, &argv)) {
+       START_TIMING("startup");
+       
+       sc_starting = TRUE;
+
+       if (!claws_init(&argc, &argv)) {
                return 0;
        }
 
+       prefs_prepare_cache();
        prog_version = PROG_VERSION;
-#ifdef CRASH_DIALOG
        argv0 = g_strdup(argv[0]);
-#endif
 
        parse_cmd_opt(argc, argv);
 
@@ -315,13 +600,16 @@ int main(int argc, char *argv[])
        }
 
        if (cmd.status || cmd.status_full) {
-               puts("0 Sylpheed-Claws not running.");
+               puts("0 Claws Mail not running.");
                lock_socket_remove();
                return 0;
        }
+       
+       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);
@@ -330,9 +618,30 @@ int main(int argc, char *argv[])
        gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
        gtk_widget_set_default_visual(gdk_rgb_get_visual());
 
-       if (!g_thread_supported())
+       if (!g_thread_supported()) {
                g_error(_("g_thread is not supported by glib.\n"));
+       }
 
+       /* check that we're not on a too recent/old gtk+ */
+#if GTK_CHECK_VERSION(2, 9, 0)
+       if (gtk_check_version(2, 9, 0) != NULL) {
+               alertpanel_error(_("Claws Mail has been compiled with "
+                                  "a more recent GTK+ library than is "
+                                  "currently available. This will cause "
+                                  "crashes. You need to upgrade GTK+ or "
+                                  "recompile Claws Mail."));
+               exit(1);
+       }
+#else
+       if (gtk_check_version(2, 9, 0) == NULL) {
+               alertpanel_error(_("Claws Mail has been compiled with "
+                                  "an older GTK+ library than is "
+                                  "currently available. This will cause "
+                                  "crashes. You need to recompile "
+                                  "Claws Mail."));
+               exit(1);
+       }
+#endif 
        /* parse gtkrc files */
        userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
                             NULL);
@@ -344,15 +653,44 @@ int main(int argc, char *argv[])
        g_free(userrc);
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
+       
+       /* no config dir exists. See if we can migrate an old config. */
        if (!is_dir_exist(RC_DIR)) {
+               prefs_destroy_cache();
                gboolean r = FALSE;
-               if (is_dir_exist(OLD_GTK2_RC_DIR))
-                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR);
-               else if (is_dir_exist(OLD_GTK1_RC_DIR))
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR);
+               
+               /* if one of the old dirs exist, we'll ask if the user 
+                * want to migrates, and r will be TRUE if he said yes
+                * and migration succeeded, and FALSE otherwise.
+                */
+               if (is_dir_exist(OLD_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 2.6.0");
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, "Sylpheed-Claws 1.9.15");
+                       asked_for_migration = TRUE;
+               } else if (is_dir_exist(OLD_GTK1_RC_DIR)) {
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, "Sylpheed-Claws 1.0.5");
+                       asked_for_migration = TRUE;
+               }
+               
+               /* If migration failed or the user didn't want to do it,
+                * we create a new one (and we'll hit wizard later). 
+                */
                if (r == FALSE && !is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0)
                        exit(1);
        }
+       
+
+       if (!is_file_exist(RC_DIR G_DIR_SEPARATOR_S COMMON_RC) &&
+           is_file_exist(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC)) {
+               /* post 2.6 name change */
+               migrate_common_rc(RC_DIR G_DIR_SEPARATOR_S OLD_COMMON_RC,
+                         RC_DIR G_DIR_SEPARATOR_S COMMON_RC);
+       }
+
+       if (!cmd.exit)
+               plugin_load_all("Common");
 
        userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
        gtk_rc_parse(userrc);
@@ -362,12 +700,9 @@ int main(int argc, char *argv[])
        gtk_accel_map_load (userrc);
        g_free(userrc);
 
-       gtk_settings_set_long_property(gtk_settings_get_default(), 
-                                      "gtk-can-change-accels",
-                                      (glong)TRUE, "XProperty");
-
        CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
 
+       MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
        MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
        MAKE_DIR_IF_NOT_EXIST(get_news_cache_dir());
        MAKE_DIR_IF_NOT_EXIST(get_mime_tmp_dir());
@@ -379,11 +714,11 @@ int main(int argc, char *argv[])
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
-       if (is_file_exist("sylpheed.log")) {
-               if (rename_force("sylpheed.log", "sylpheed.log.bak") < 0)
-                       FILE_OP_ERROR("sylpheed.log", "rename");
+       if (is_file_exist("claws.log")) {
+               if (rename_force("claws.log", "claws.log.bak") < 0)
+                       FILE_OP_ERROR("claws.log", "rename");
        }
-       set_log_file("sylpheed.log");
+       set_log_file("claws.log");
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
@@ -408,7 +743,7 @@ int main(int argc, char *argv[])
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #endif
-       
+
        sock_set_io_timeout(prefs_common.io_timeout_secs);
 #ifdef HAVE_LIBETPAN
        imap_main_set_timeout(prefs_common.io_timeout_secs);
@@ -420,7 +755,7 @@ int main(int argc, char *argv[])
        renderer_read_config();
 
        gtkut_widget_init();
-       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_ICON, &icon);
+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
 
        folderview_initialize();
@@ -428,9 +763,11 @@ int main(int argc, char *argv[])
        mh_gtk_init();
        imap_gtk_init();
        news_gtk_init();
-               
+
        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));
@@ -447,24 +784,50 @@ int main(int argc, char *argv[])
        prefs_account_init();
        account_read_config_all();
 
+       /* If we can't read a folder list or don't have accounts,
+        * it means the configuration's not done. Either this is
+        * a brand new install, either a failed/refused migration.
+        * So we'll start the wizard.
+        */
        if (folder_read_list() < 0) {
-               if (!run_wizard(mainwin, TRUE))
+               prefs_destroy_cache();
+               
+               /* if run_wizard returns FALSE it's because it's
+                * been cancelled. We can't do much but exit.
+                * however, if the user was asked for a migration,
+                * we remove the newly created directory so that
+                * he's asked again for migration on next launch.*/
+               if (!run_wizard(mainwin, TRUE)) {
+                       if (asked_for_migration)
+                               remove_dir_recursive(RC_DIR);
                        exit(1);
+               }
+               main_window_reflect_prefs_all_now();
                folder_write_list();
        }
 
        if (!account_get_list()) {
-               if (!run_wizard(mainwin, FALSE))
+               prefs_destroy_cache();
+               if (!run_wizard(mainwin, FALSE)) {
+                       if (asked_for_migration)
+                               remove_dir_recursive(RC_DIR);
                        exit(1);
+               }
                account_read_config_all();
-               if(!account_get_list())
-                       exit_sylpheed(mainwin);
+               if(!account_get_list()) {
+                       exit_claws(mainwin);
+                       exit(1);
+               }
        }
 
+       
+       toolbar_main_set_sensitive(mainwin);
+       main_window_set_menu_sensitive(mainwin);
+
        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();
@@ -472,13 +835,14 @@ int main(int argc, char *argv[])
 
        prefs_matcher_read_config();
 
-       /* make one all-folder processing before using sylpheed */
+       /* make one all-folder processing before using claws */
        main_window_cursor_wait(mainwin);
        folder_func_to_all_folders(initial_processing, (gpointer *)mainwin);
 
-       /* if Sylpheed crashed, rebuild caches */
+       /* if claws crashed, rebuild caches */
        if (!cmd.crash && crash_file_present) {
-               debug_print("Sylpheed-Claws crashed, checking for new messages in local folders\n");
+               GTK_EVENTS_FLUSH();
+               debug_print("Claws Mail crashed, checking for new messages in local folders\n");
                folder_item_update_thaw();
                folderview_check_new(NULL);
                folder_clean_cache_memory_force();
@@ -487,18 +851,18 @@ int main(int argc, char *argv[])
        /* make the crash-indicator file */
        str_write_to_file("foo", get_crashfile_name());
 
-       addressbook_read_file();
-
        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)
+       if (cmd.online_mode == ONLINE_MODE_OFFLINE) {
                main_window_toggle_work_offline(mainwin, TRUE, FALSE);
-       if (cmd.online_mode == ONLINE_MODE_ONLINE)
+       }
+       if (cmd.online_mode == ONLINE_MODE_ONLINE) {
                main_window_toggle_work_offline(mainwin, FALSE, FALSE);
+       }
 
        if (cmd.status_folders) {
                g_ptr_array_free(cmd.status_folders, TRUE);
@@ -509,67 +873,130 @@ int main(int argc, char *argv[])
                cmd.status_full_folders = NULL;
        }
 
-       sylpheed_register_idle_function(sylpheed_gtk_idle);
+       claws_register_idle_function(claws_gtk_idle);
 
        prefs_toolbar_init();
 
+       num_folder_class = g_list_length(folder_get_list());
+
        plugin_load_all("GTK2");
+
+       if (g_list_length(folder_get_list()) != num_folder_class) {
+               debug_print("new folders loaded, reloading processing rules\n");
+               prefs_matcher_read_config();
+       }
+       
+       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()) {
+               prefs_destroy_cache();
+               main_window_cursor_normal(mainwin);
+               if (folder_get_list() != NULL) {
+                       alertpanel_error(_("Claws Mail has detected a configured "
+                                  "mailbox, but is it incomplete. It is "
+                                  "possibly due to a failing IMAP account. Use "
+                                  "\"Rebuild folder tree\" on the mailbox's folder "
+                                  "to try to fix it."));
+               } else {
+                       alertpanel_error(_("Claws Mail has detected a configured "
+                                  "mailbox, but could not load it. It is "
+                                  "probably provided by an out-of-date "
+                                  "external plugin. Please reinstall the "
+                                  "plugin and try again."));
+                       exit_claws(mainwin);
+                       exit(1);
+               }
+       }
        
        static_mainwindow = mainwin;
 
 #ifdef HAVE_STARTUP_NOTIFICATION
        startup_notification_complete(FALSE);
+#endif
+#ifdef HAVE_LIBSM
+       sc_session_manager_connect(mainwin);
 #endif
        folder_item_update_thaw();
        gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
-       if (cmd.receive_all)
+       if (cmd.receive_all) {
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
-       else if (prefs_common.chk_on_startup)
+       } else if (prefs_common.chk_on_startup) {
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
-       else if (cmd.receive)
+       } else if (cmd.receive) {
                g_timeout_add(1000, defer_check, NULL);
-       else
+       } else {
                gtk_widget_grab_focus(folderview->ctree);
+       }
 
-       if (cmd.compose)
+       if (cmd.compose) {
                open_compose_new(cmd.compose_mailto, cmd.attach_files);
+       }
        if (cmd.attach_files) {
                ptr_array_free_strings(cmd.attach_files);
                g_ptr_array_free(cmd.attach_files, TRUE);
                cmd.attach_files = NULL;
        }
-       if (cmd.send)
+       if (cmd.subscribe) {
+               folder_subscribe(cmd.subscribe_uri);
+       }
+
+       if (cmd.send) {
                send_queue();
+       }
+       
+       if (cmd.target) {
+               g_timeout_add(500, defer_jump, (gpointer)cmd.target);
+       }
+
+       prefs_destroy_cache();
+       
+       sc_starting = FALSE;
+       END_TIMING();
        
        gtk_main();
 
-       exit_sylpheed(mainwin);
+       exit_claws(mainwin);
 
        return 0;
 }
 
 static void save_all_caches(FolderItem *item, gpointer data)
 {
-       if (!item->cache)
+       if (!item->cache) {
                return;
-       folder_item_write_cache(item);
+       }
+
+       if (item->opened)
+               folder_item_close(item);
+       
+       folder_item_free_cache(item, TRUE);
 }
 
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
 
+       sc_exiting = TRUE;
+
        debug_print("shutting down\n");
        inc_autocheck_timer_remove();
 
-       if (prefs_common.clean_on_exit)
+       if (prefs_common.clean_on_exit && !emergency_exit) {
                main_window_empty_trash(mainwin, prefs_common.ask_on_clean);
+       }
 
        /* save prefs for opened folder */
-       if(mainwin->folderview->opened)
-       {
+       if(mainwin->folderview->opened) {
                FolderItem *item;
 
                item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
@@ -577,8 +1004,8 @@ static void exit_sylpheed(MainWindow *mainwin)
        }
 
        /* save all state before exiting */
-       folder_write_list();
        folder_func_to_all_folders(save_all_caches, NULL);
+       folder_write_list();
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
@@ -605,7 +1032,13 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
-       main_window_destroy(mainwin);
+#ifdef HAVE_LIBSM
+       if (mainwin->smc_conn)
+               SmcCloseConnection ((SmcConn)mainwin->smc_conn, 0, NULL);
+       mainwin->smc_conn = NULL;
+#endif
+
+       main_window_destroy_all();
        
        plugin_unload_all("GTK2");
 
@@ -631,8 +1064,8 @@ static void exit_sylpheed(MainWindow *mainwin)
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #endif
-       sylpheed_done();
-
+       plugin_unload_all("Common");
+       claws_done();
 }
 
 static void parse_cmd_opt(int argc, char *argv[])
@@ -640,52 +1073,63 @@ static void parse_cmd_opt(int argc, char *argv[])
        gint i;
 
        for (i = 1; i < argc; i++) {
-               if (!strncmp(argv[i], "--receive-all", 13))
+               if (!strncmp(argv[i], "--receive-all", 13)) {
                        cmd.receive_all = TRUE;
-               else if (!strncmp(argv[i], "--receive", 9))
+               } else if (!strncmp(argv[i], "--receive", 9)) {
                        cmd.receive = TRUE;
-               else if (!strncmp(argv[i], "--compose", 9)) {
+               else if (!strncmp(argv[i], "--compose", 9)) {
                        const gchar *p = argv[i + 1];
 
                        cmd.compose = TRUE;
                        cmd.compose_mailto = NULL;
                        if (p && *p != '\0' && *p != '-') {
-                               if (!strncmp(p, "mailto:", 7))
+                               if (!strncmp(p, "mailto:", 7)) {
                                        cmd.compose_mailto = p + 7;
-                               else
+                               } else {
                                        cmd.compose_mailto = p;
+                               }
                                i++;
                        }
+               } else if (!strncmp(argv[i], "--subscribe", 11)) {
+                       const gchar *p = argv[i + 1];
+                       if (p && *p != '\0' && *p != '-') {
+                               cmd.subscribe = TRUE;
+                               cmd.subscribe_uri = p;
+                       }
                } else if (!strncmp(argv[i], "--attach", 8)) {
                        const gchar *p = argv[i + 1];
                        gchar *file;
 
                        while (p && *p != '\0' && *p != '-') {
-                               if (!cmd.attach_files)
+                               if (!cmd.attach_files) {
                                        cmd.attach_files = g_ptr_array_new();
-                               if (*p != G_DIR_SEPARATOR)
-                                       file = g_strconcat(sylpheed_get_startup_dir(),
+                               }
+                               if (*p != G_DIR_SEPARATOR) {
+                                       file = g_strconcat(claws_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
-                               else
+                               } else {
                                        file = g_strdup(p);
+                               }
                                g_ptr_array_add(cmd.attach_files, file);
                                i++;
                                p = argv[i + 1];
                        }
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
-               } else if (!strncmp(argv[i], "--version", 9)) {
-                       puts("Sylpheed-Claws version " VERSION);
+               } else if (!strncmp(argv[i], "--version", 9) ||
+                          !strncmp(argv[i], "-v", 2)) {
+                       puts("Claws Mail version " VERSION);
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
  
                        cmd.status_full = TRUE;
                        while (p && *p != '\0' && *p != '-') {
-                               if (!cmd.status_full_folders)
+                               if (!cmd.status_full_folders) {
                                        cmd.status_full_folders =
                                                g_ptr_array_new();
+                               }
                                g_ptr_array_add(cmd.status_full_folders,
                                                g_strdup(p));
                                i++;
@@ -707,11 +1151,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                        cmd.online_mode = ONLINE_MODE_ONLINE;
                } else if (!strncmp(argv[i], "--offline", 9)) {
                        cmd.online_mode = ONLINE_MODE_OFFLINE;
-               } else if (!strncmp(argv[i], "--help", 6)) {
+               } else if (!strncmp(argv[i], "--help", 6) ||
+                          !strncmp(argv[i], "-h", 2)) {
                        gchar *base = g_path_get_basename(argv[0]);
                        g_print(_("Usage: %s [OPTION]...\n"), base);
 
                        g_print("%s\n", _("  --compose [address]    open composition window"));
+                       g_print("%s\n", _("  --subscribe [uri]      subscribe to the given URI if possible"));
                        g_print("%s\n", _("  --attach file1 [file2]...\n"
                                  "                         open composition window with specified files\n"
                                  "                         attached"));
@@ -721,12 +1167,14 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --status [folder]...   show the total number of messages"));
                        g_print("%s\n", _("  --status-full [folder]...\n"
                               "                         show the status of each folder"));
+                       g_print("%s\n", _("  --select folder[/msg]  jumps to the specified folder/message\n" 
+                                         "                         folder is a folder id like 'folder/sub_folder'"));
                        g_print("%s\n", _("  --online               switch to online mode"));
                        g_print("%s\n", _("  --offline              switch to offline mode"));
-                       g_print("%s\n", _("  --exit                 exit Sylpheed-Claws"));
+                       g_print("%s\n", _("  --exit --quit -q       exit Claws Mail"));
                        g_print("%s\n", _("  --debug                debug mode"));
-                       g_print("%s\n", _("  --help                 display this help and exit"));
-                       g_print("%s\n", _("  --version              output version information and exit"));
+                       g_print("%s\n", _("  --help -h              display this help and exit"));
+                       g_print("%s\n", _("  --version -v           output version information and exit"));
                        g_print("%s\n", _("  --config-dir           output configuration directory"));
 
                        g_free(base);
@@ -738,10 +1186,39 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--config-dir", sizeof "--config-dir" - 1)) {
                        puts(RC_DIR);
                        exit(0);
-               } else if (!strncmp(argv[i], "--exit", 6)) {
+               } else if (!strncmp(argv[i], "--exit", 6) ||
+                          !strncmp(argv[i], "--quit", 6) ||
+                          !strncmp(argv[i], "-q", 2)) {
                        cmd.exit = TRUE;
+               } else if (!strncmp(argv[i], "--select", 8) && i+1 < argc) {
+                       cmd.target = argv[i+1];
+               } else if (i == 1 && argc == 2) {
+                       /* only one parameter. Do something intelligent about it */
+                       if (strstr(argv[i], "@") && !strstr(argv[i], "://")) {
+                               const gchar *p = argv[i];
+
+                               cmd.compose = TRUE;
+                               cmd.compose_mailto = NULL;
+                               if (p && *p != '\0' && *p != '-') {
+                                       if (!strncmp(p, "mailto:", 7)) {
+                                               cmd.compose_mailto = p + 7;
+                                       } else {
+                                               cmd.compose_mailto = p;
+                                       }
+                               }
+                       } else if (strstr(argv[i], "://")) {
+                               const gchar *p = argv[i];
+                               if (p && *p != '\0' && *p != '-') {
+                                       cmd.subscribe = TRUE;
+                                       cmd.subscribe_uri = p;
+                               }
+                       } else if (!strcmp(argv[i], "--sync")) {
+                               /* gtk debug */
+                       } else {
+                               g_print(_("Unknown option\n"));
+                               exit(1);
+                       }
                }
-               
        }
 
        if (cmd.attach_files && cmd.compose == FALSE) {
@@ -755,7 +1232,9 @@ static gint get_queued_message_num(void)
        FolderItem *queue;
 
        queue = folder_get_default_queue();
-       if (!queue) return -1;
+       if (!queue) {
+               return -1;
+       }
 
        folder_item_scan(queue);
        return queue->total_msgs;
@@ -771,14 +1250,13 @@ static void initial_processing(FolderItem *item, gpointer data)
                              item->path 
                              ? item->path 
                              : _("top level folder"));
-       debug_print("%s\n", buf);
        g_free(buf);
 
        
-        if (item->prefs->enable_processing)
-                folder_item_apply_processing(item);
+       if (item->prefs->enable_processing) {
+               folder_item_apply_processing(item);
+       }
 
-       debug_print("done.\n");
        STATUSBAR_POP(mainwin);
 }
 
@@ -791,13 +1269,13 @@ static void draft_all_messages(void)
                compose_draft(c);
        }       
 }
-
 gboolean clean_quit(gpointer data)
 {
        static gboolean firstrun = TRUE;
 
-       if (!firstrun)
+       if (!firstrun) {
                return FALSE;
+       }
        firstrun = FALSE;
 
        /*!< Good idea to have the main window stored in a 
@@ -812,12 +1290,13 @@ gboolean clean_quit(gpointer data)
        /* FIXME: Use something else to signal that we're
         * in the original spawner, and not in a spawned
         * child. */
-       if (!static_mainwindow) 
+       if (!static_mainwindow) {
                return FALSE;
+       }
                
        draft_all_messages();
-
-       exit_sylpheed(static_mainwindow);
+       emergency_exit = TRUE;
+       exit_claws(static_mainwindow);
        exit(0);
 
        return FALSE;
@@ -826,13 +1305,20 @@ gboolean clean_quit(gpointer data)
 void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
-
+       
+       if (sc_exiting == TRUE) {
+               debug_print("exit pending\n");
+               return;
+       }
+       sc_exiting = TRUE;
+       debug_print("exiting\n");
        if (compose_get_compose_list()) {
                gint val = alertpanel(_("Really quit?"),
                               _("Composing message exists."),
                               _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
                switch (val) {
                        case G_ALERTOTHER:
+                               sc_exiting = FALSE;
                                return;
                        case G_ALERTALTERNATE:
                                break;
@@ -846,30 +1332,40 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        if (prefs_common.warn_queued_on_exit && get_queued_message_num() > 0) {
                if (alertpanel(_("Queued messages"),
                               _("Some unsent messages are queued. Exit now?"),
-                              GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
-                   != G_ALERTDEFAULT)
+                              GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
+                   != G_ALERTALTERNATE) {
+                       sc_exiting = FALSE;
                        return;
+               }
                manage_window_focus_in(mainwin->window, NULL, NULL);
        }
 
        sock_cleanup();
-
+       if (folderview_get_selected_item(mainwin->folderview))
+               folder_item_close(folderview_get_selected_item(mainwin->folderview));
        gtk_main_quit();
 }
 
+gboolean claws_is_exiting(void)
+{
+       return sc_exiting;
+}
+
+gboolean claws_is_starting(void)
+{
+       return sc_starting;
+}
+
 /*
  * CLAWS: want this public so crash dialog can delete the
  * lock file too
  */
-#ifndef CLAWS
-static
-#endif
 gchar *get_socket_name(void)
 {
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-claws-%d",
+               filename = g_strdup_printf("%s%cclaws-mail-%d",
                                           g_get_tmp_dir(), G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());
@@ -886,7 +1382,7 @@ static gchar *get_crashfile_name(void)
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-crashed",
+               filename = g_strdup_printf("%s%cclaws-crashed",
                                           get_tmp_dir(), G_DIR_SEPARATOR);
        }
 
@@ -907,21 +1403,22 @@ static gint prohibit_duplicate_launch(void)
 
        /* remote command mode */
 
-       debug_print("another Sylpheed-Claws instance is already running.\n");
+       debug_print("another Claws Mail instance is already running.\n");
 
-       if (cmd.receive_all)
+       if (cmd.receive_all) {
                fd_write_all(uxsock, "receive_all\n", 12);
-       else if (cmd.receive)
+       } else if (cmd.receive) {
                fd_write_all(uxsock, "receive\n", 8);
-       else if (cmd.compose && cmd.attach_files) {
+       else if (cmd.compose && cmd.attach_files) {
                gchar *str, *compose_str;
                gint i;
 
-               if (cmd.compose_mailto)
+               if (cmd.compose_mailto) {
                        compose_str = g_strdup_printf("compose_attach %s\n",
                                                      cmd.compose_mailto);
-               else
+               } else {
                        compose_str = g_strdup("compose_attach\n");
+               }
 
                fd_write_all(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
@@ -936,14 +1433,19 @@ static gint prohibit_duplicate_launch(void)
        } else if (cmd.compose) {
                gchar *compose_str;
 
-               if (cmd.compose_mailto)
+               if (cmd.compose_mailto) {
                        compose_str = g_strdup_printf
                                ("compose %s\n", cmd.compose_mailto);
-               else
+               } else {
                        compose_str = g_strdup("compose\n");
+               }
 
                fd_write_all(uxsock, compose_str, strlen(compose_str));
                g_free(compose_str);
+       } else if (cmd.subscribe) {
+               gchar *str = g_strdup_printf("subscribe %s\n", cmd.subscribe_uri);
+               fd_write_all(uxsock, str, strlen(str));
+               g_free(str);
        } else if (cmd.send) {
                fd_write_all(uxsock, "send\n", 5);
        } else if (cmd.online_mode == ONLINE_MODE_ONLINE) {
@@ -975,6 +1477,10 @@ static gint prohibit_duplicate_launch(void)
                }
        } else if (cmd.exit) {
                fd_write_all(uxsock, "exit\n", 5);
+       } else if (cmd.target) {
+               gchar *str = g_strdup_printf("select %s\n", cmd.target);
+               fd_write_all(uxsock, str, strlen(str));
+               g_free(str);
        } else
                fd_write_all(uxsock, "popup\n", 6);
 
@@ -987,10 +1493,13 @@ static gint lock_socket_remove(void)
 #ifdef G_OS_UNIX
        gchar *filename;
 
-       if (lock_socket < 0) return -1;
+       if (lock_socket < 0) {
+               return -1;
+       }
 
-       if (lock_socket_tag > 0)
+       if (lock_socket_tag > 0) {
                gdk_input_remove(lock_socket_tag);
+       }
        fd_close(lock_socket);
        filename = get_socket_name();
        g_unlink(filename);
@@ -1007,14 +1516,19 @@ static GPtrArray *get_folder_item_list(gint sock)
 
        for (;;) {
                fd_gets(sock, buf, sizeof(buf));
-               if (!strncmp(buf, ".\n", 2)) break;
+               if (!strncmp(buf, ".\n", 2)) {
+                       break;
+               }
                strretchomp(buf);
-               if (!folders) folders = g_ptr_array_new();
+               if (!folders) {
+                       folders = g_ptr_array_new();
+               }
                item = folder_find_item_from_identifier(buf);
-               if (item)
+               if (item) {
                        g_ptr_array_add(folders, item);
-               else
+               } else {
                        g_warning("no such folder: %s\n", buf);
+               }
        }
 
        return folders;
@@ -1045,7 +1559,9 @@ static void lock_socket_input_cb(gpointer data,
                mailto = g_strdup(buf + strlen("compose_attach") + 1);
                files = g_ptr_array_new();
                while (fd_gets(sock, buf, sizeof(buf)) > 0) {
-                       if (buf[0] == '.' && buf[1] == '\n') break;
+                       if (buf[0] == '.' && buf[1] == '\n') {
+                               break;
+                       }
                        strretchomp(buf);
                        g_ptr_array_add(files, g_strdup(buf));
                }
@@ -1055,6 +1571,9 @@ static void lock_socket_input_cb(gpointer data,
                g_free(mailto);
        } else if (!strncmp(buf, "compose", 7)) {
                open_compose_new(buf + strlen("compose") + 1, NULL);
+       } else if (!strncmp(buf, "subscribe", 9)) {
+               main_window_popup(mainwin);
+               folder_subscribe(buf + strlen("subscribe") + 1);
        } else if (!strncmp(buf, "send", 4)) {
                send_queue();
        } else if (!strncmp(buf, "online", 6)) {
@@ -1073,6 +1592,9 @@ static void lock_socket_input_cb(gpointer data,
                fd_write_all(sock, ".\n", 2);
                g_free(status);
                if (folders) g_ptr_array_free(folders, TRUE);
+       } else if (!strncmp(buf, "select ", 7)) {
+               const gchar *target = buf+7;
+               mainwindow_jump_to(target);
        } else if (!strncmp(buf, "exit", 4)) {
                app_will_exit(NULL, mainwin);
        }
@@ -1095,20 +1617,30 @@ 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)        
+                       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)
@@ -1120,6 +1652,7 @@ static void quit_signal_handler(int sig)
 
 static void install_basic_sighandlers()
 {
+#ifndef G_OS_WIN32
        sigset_t    mask;
        struct sigaction act;
 
@@ -1150,4 +1683,5 @@ static void install_basic_sighandlers()
 #endif 
 
        sigprocmask(SIG_UNBLOCK, &mask, 0);
+#endif /* !G_OS_WIN32 */
 }