2006-12-13 [colin] 2.6.1cvs26
[claws.git] / src / main.c
index bf89c0edbf48c9bcd71dfc0b11683787119cc643..0c98552c2bf8353624953617a676b5e137b704af 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 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;
@@ -165,7 +170,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) \
 { \
@@ -183,6 +188,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)
@@ -228,7 +234,7 @@ static void startup_notification_complete(gboolean with_window)
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-void sylpheed_gtk_idle(void) 
+void claws_gtk_idle(void) 
 {
        while(gtk_events_pending()) {
                gtk_main_iteration();
@@ -259,12 +265,10 @@ static gboolean defer_jump(void *data)
        return FALSE;
 }
 
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+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"),
@@ -283,6 +287,223 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        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;
@@ -291,14 +512,17 @@ int main(int argc, char *argv[])
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
-       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);
 
@@ -326,7 +550,7 @@ 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;
        }
@@ -348,6 +572,26 @@ int main(int argc, char *argv[])
                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);
@@ -360,14 +604,26 @@ int main(int argc, char *argv[])
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
        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);
+                       r = migrate_old_config(OLD_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 2.6.0"));
+               else if (is_dir_exist(OLDER_GTK2_RC_DIR))
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.9.15"));
                else if (is_dir_exist(OLD_GTK1_RC_DIR))
-                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR);
+                       r = migrate_old_config(OLD_GTK1_RC_DIR, RC_DIR, _("Sylpheed-Claws 1.0.5"));
                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);
@@ -395,11 +651,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);
 
@@ -436,7 +692,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();
@@ -444,9 +700,10 @@ 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));
@@ -464,19 +721,28 @@ int main(int argc, char *argv[])
        account_read_config_all();
 
        if (folder_read_list() < 0) {
+               prefs_destroy_cache();
                if (!run_wizard(mainwin, TRUE))
                        exit(1);
+               main_window_reflect_prefs_all_now();
                folder_write_list();
        }
 
        if (!account_get_list()) {
+               prefs_destroy_cache();
                if (!run_wizard(mainwin, FALSE))
                        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
@@ -488,13 +754,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();
@@ -525,7 +792,7 @@ 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();
 
@@ -539,24 +806,42 @@ 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()) {
-               alertpanel_error(_("Sylpheed-Claws has detected a configured "
+               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(1);
+                       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));
@@ -592,9 +877,14 @@ int main(int argc, char *argv[])
                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;
 }
@@ -607,18 +897,20 @@ static void save_all_caches(FolderItem *item, gpointer data)
 
        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);
        }
 
@@ -631,8 +923,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);
@@ -659,6 +951,12 @@ static void exit_sylpheed(MainWindow *mainwin)
 
        lock_socket_remove();
 
+#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");
@@ -685,8 +983,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[])
@@ -726,7 +1024,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        cmd.attach_files = g_ptr_array_new();
                                }
                                if (*p != G_DIR_SEPARATOR) {
-                                       file = g_strconcat(sylpheed_get_startup_dir(),
+                                       file = g_strconcat(claws_get_startup_dir(),
                                                           G_DIR_SEPARATOR_S,
                                                           p, NULL);
                                } else {
@@ -739,7 +1037,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9)) {
-                       puts("Sylpheed-Claws version " VERSION);
+                       puts("Claws Mail version " VERSION);
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
@@ -790,7 +1088,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                                          "                         folder is a folder id like '#mh/Mailbox/inbox'"));
                        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                 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"));
@@ -863,7 +1161,6 @@ static void initial_processing(FolderItem *item, gpointer data)
                              item->path 
                              ? item->path 
                              : _("top level folder"));
-       debug_print("%s\n", buf);
        g_free(buf);
 
        
@@ -871,7 +1168,6 @@ static void initial_processing(FolderItem *item, gpointer data)
                folder_item_apply_processing(item);
        }
 
-       debug_print("done.\n");
        STATUSBAR_POP(mainwin);
 }
 
@@ -884,7 +1180,6 @@ static void draft_all_messages(void)
                compose_draft(c);
        }       
 }
-
 gboolean clean_quit(gpointer data)
 {
        static gboolean firstrun = TRUE;
@@ -911,8 +1206,8 @@ gboolean clean_quit(gpointer data)
        }
                
        draft_all_messages();
-
-       exit_sylpheed(static_mainwindow);
+       emergency_exit = TRUE;
+       exit_claws(static_mainwindow);
        exit(0);
 
        return FALSE;
@@ -922,12 +1217,19 @@ 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;
@@ -943,6 +1245,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                               _("Some unsent messages are queued. Exit now?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
                    != G_ALERTALTERNATE) {
+                       sc_exiting = FALSE;
                        return;
                }
                manage_window_focus_in(mainwin->window, NULL, NULL);
@@ -954,6 +1257,16 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        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
@@ -966,7 +1279,7 @@ 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());
@@ -983,7 +1296,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);
        }
 
@@ -1004,7 +1317,7 @@ 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) {
                fd_write_all(uxsock, "receive_all\n", 12);