2007-01-18 [colin] 2.7.1cvs31
[claws.git] / src / main.c
index b3611fd5b47919955df7cb9d20ed4885cc9bd13a..f0d7dd4b32ae192f4e0181460b41b2b228e82600 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-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
@@ -51,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;
 gchar *argv0;
 
@@ -155,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);
 
 
@@ -168,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) \
 { \
@@ -232,7 +232,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();
@@ -263,30 +263,121 @@ static gboolean defer_jump(void *data)
        return FALSE;
 }
 
-static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cfg_dir)
+static void chk_update_val(GtkWidget *widget, gpointer data)
 {
-       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"));
+        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 %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_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
+       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,
@@ -458,6 +549,9 @@ static void sc_session_manager_connect(MainWindow *mainwin)
 }
 #endif
 
+static gboolean sc_exiting = FALSE;
+static gboolean sc_starting = FALSE;
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
@@ -466,10 +560,17 @@ int main(int argc, char *argv[])
        GdkPixbuf *icon;
        gboolean crash_file_present = FALSE;
        gint num_folder_class = 0;
-       if (!sylpheed_init(&argc, &argv)) {
+       gboolean asked_for_migration = FALSE;
+
+       START_TIMING("startup");
+       
+       sc_starting = TRUE;
+
+       if (!claws_init(&argc, &argv)) {
                return 0;
        }
 
+       prefs_prepare_cache();
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);
 
@@ -499,7 +600,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;
        }
@@ -524,20 +625,20 @@ int main(int argc, char *argv[])
        /* 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(_("Sylpheed-Claws has been compiled with "
+               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 Sylpheed-Claws."));
+                                  "recompile Claws Mail."));
                exit(1);
        }
 #else
        if (gtk_check_version(2, 9, 0) == NULL) {
-               alertpanel_error(_("Sylpheed-Claws has been compiled with "
+               alertpanel_error(_("Claws Mail has been compiled with "
                                   "an older GTK+ library than is "
                                   "currently available. This will cause "
                                   "crashes. You need to recompile "
-                                  "Sylpheed-Claws."));
+                                  "Claws Mail."));
                exit(1);
        }
 #endif 
@@ -552,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);
@@ -570,10 +700,6 @@ 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());
@@ -588,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);
 
@@ -617,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);
@@ -629,7 +755,7 @@ int main(int argc, char *argv[])
        renderer_read_config();
 
        gtkut_widget_init();
-       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_CLAWS_ICON, &icon);
+       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
 
        folderview_initialize();
@@ -637,9 +763,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;
 
@@ -657,19 +784,40 @@ 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);
+               }
        }
 
        
@@ -687,14 +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) {
                GTK_EVENTS_FLUSH();
-               debug_print("Sylpheed-Claws crashed, checking for new messages in local folders\n");
+               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();
@@ -725,7 +873,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();
 
@@ -749,13 +897,23 @@ int main(int argc, char *argv[])
        plugin_load_standard_plugins ();
        
        if (!folder_have_mailbox()) {
+               prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
-               alertpanel_error(_("Sylpheed-Claws has detected a configured "
+               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;
@@ -800,9 +958,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;
 }
@@ -819,9 +982,7 @@ static void save_all_caches(FolderItem *item, gpointer data)
        folder_item_free_cache(item, TRUE);
 }
 
-static gboolean sc_exiting = FALSE;
-
-static void exit_sylpheed(MainWindow *mainwin)
+static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
 
@@ -903,7 +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[])
@@ -943,7 +1105,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 {
@@ -955,8 +1117,9 @@ 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);
+               } 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];
@@ -988,7 +1151,8 @@ 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);
 
@@ -1004,13 +1168,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                        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 '#mh/Mailbox/inbox'"));
+                                         "                         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);
@@ -1022,7 +1186,9 @@ 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];
@@ -1046,9 +1212,13 @@ static void parse_cmd_opt(int argc, char *argv[])
                                        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) {
@@ -1126,7 +1296,7 @@ gboolean clean_quit(gpointer data)
                
        draft_all_messages();
        emergency_exit = TRUE;
-       exit_sylpheed(static_mainwindow);
+       exit_claws(static_mainwindow);
        exit(0);
 
        return FALSE;
@@ -1176,24 +1346,26 @@ void app_will_exit(GtkWidget *widget, gpointer data)
        gtk_main_quit();
 }
 
-gboolean sylpheed_is_exiting(void)
+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());
@@ -1210,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);
        }
 
@@ -1231,7 +1403,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);