on first run, use --alternate-config-dir (if set) on prefs migration

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 388a66f06a368420c4b2b4e520802f60a29b16e3..3d2eccef7d1a512a550cd9df7468dd25829f87fb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -424,7 +424,8 @@ backup_mode:
                
                /* if g_rename failed, we'll try to copy */
                if (r != 0) {
-                       FILE_OP_ERROR(new_cfg_dir, "g_rename failed, trying copy\n");
+                       FILE_OP_ERROR(new_cfg_dir, "g_rename");
+                       debug_print("rename failed, trying copy\n");
                        goto backup_mode;
                }
        }
@@ -463,8 +464,8 @@ static int migrate_common_rc(const gchar *old_rc, const gchar *new_rc)
                if (strncmp(buf, old_plugin_path, strlen(old_plugin_path))) {
                        err |= (fputs(buf, newfp) == EOF);
                } else {
-                       debug_print("->replacing %s", buf);
-                       debug_print("  with %s%s", new_plugin_path, buf+strlen(old_plugin_path));
+                       debug_print("->replacing %s\n", buf);
+                       debug_print("  with %s%s\n", new_plugin_path, buf+strlen(old_plugin_path));
                        err |= (fputs(new_plugin_path, newfp) == EOF);
                        err |= (fputs(buf+strlen(old_plugin_path), newfp) == EOF);
                }
@@ -1126,7 +1127,7 @@ int main(int argc, char *argv[])
 #endif
        
        /* no config dir exists. See if we can migrate an old config. */
-       if (!is_dir_exist(RC_DIR)) {
+       if (!is_dir_exist(get_rc_dir())) {
                prefs_destroy_cache();
                gboolean r = FALSE;
                
@@ -1135,30 +1136,30 @@ int main(int argc, char *argv[])
                 * and migration succeeded, and FALSE otherwise.
                 */
                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, get_rc_dir(),
                                               g_strconcat("Sylpheed-Claws 2.6.0 ", _("(or older)"), NULL));
                        asked_for_migration = TRUE;
                } else if (is_dir_exist(OLDER_GTK2_RC_DIR)) {
-                       r = migrate_old_config(OLDER_GTK2_RC_DIR, RC_DIR,
+                       r = migrate_old_config(OLDER_GTK2_RC_DIR, get_rc_dir(),
                                               g_strconcat("Sylpheed-Claws 1.9.15 ",_("(or older)"), NULL));
                        asked_for_migration = TRUE;
                } 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, get_rc_dir(),
                                               g_strconcat("Sylpheed-Claws 1.0.5 ",_("(or older)"), NULL));
                        asked_for_migration = TRUE;
                } else if (is_dir_exist(SYLPHEED_RC_DIR)) {
-                       r = migrate_old_config(SYLPHEED_RC_DIR, RC_DIR, "Sylpheed");
+                       r = migrate_old_config(SYLPHEED_RC_DIR, get_rc_dir(), "Sylpheed");
                        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)) {
+               if (r == FALSE && !is_dir_exist(get_rc_dir())) {
 #ifdef G_OS_UNIX
-                       if (copy_dir(SYSCONFDIR "/skel/.claws-mail", RC_DIR) < 0) {
+                       if (copy_dir(SYSCONFDIR "/skel/.claws-mail", get_rc_dir()) < 0) {
 #endif
-                               if (!is_dir_exist(RC_DIR) && make_dir(RC_DIR) < 0) {
+                               if (!is_dir_exist(get_rc_dir()) && make_dir(get_rc_dir()) < 0) {
 #ifdef G_OS_WIN32
                                        win32_close_log();
 #endif
@@ -1279,7 +1280,7 @@ int main(int argc, char *argv[])
        }
 #endif
        gtkut_widget_init();
-       stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
+       stock_pixbuf_gdk(STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
        gtk_window_set_default_icon(icon);
 
        folderview_initialize();
@@ -1300,7 +1301,7 @@ int main(int argc, char *argv[])
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
-       gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
+       folderview_freeze(mainwin->folderview);
        folder_item_update_freeze();
 
        passwd_store_read_config();
@@ -1458,12 +1459,20 @@ int main(int argc, char *argv[])
                g_slist_free(plug_list);
        }
 
-       prefs_update_config_version();
-
        if (never_ran) {
+               prefs_common_get_prefs()->config_version = CLAWS_CONFIG_VERSION;
                prefs_common_write_config();
                plugin_load_standard_plugins ();
+       } else {
+               if (prefs_update_config_version() < 0) {
+                       exit_claws(mainwin);
+#ifdef G_OS_WIN32
+                       win32_close_log();
+#endif
+                       exit(0);
+               }
        }
+
        /* if not crashed, show window now */
        if (!mainwin_shown) {
                /* apart if something told not to show */
@@ -1517,7 +1526,7 @@ int main(int argc, char *argv[])
 #endif
 
        folder_item_update_thaw();
-       gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
+       folderview_thaw(mainwin->folderview);
        main_window_cursor_normal(mainwin);
 
        if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
@@ -1535,8 +1544,8 @@ int main(int argc, char *argv[])
        } else if (cmd.receive && !cmd.target) {
                start_done = FALSE;
                g_timeout_add(1000, defer_check, NULL);
-       } 
-       gtk_widget_grab_focus(folderview->ctree);
+       }
+       folderview_grab_focus(folderview);
 
        if (cmd.compose) {
                open_compose_new(cmd.compose_mailto, cmd.attach_files);
@@ -1614,6 +1623,7 @@ static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
        gboolean have_connectivity;
+       FolderItem *item;
 
        sc_exiting = TRUE;
 
@@ -1626,18 +1636,11 @@ static void exit_claws(MainWindow *mainwin)
 #endif
 
        /* save prefs for opened folder */
-       if(mainwin->folderview->opened) {
-               FolderItem *item;
-
-               item = gtk_cmctree_node_get_row_data(
-                       GTK_CMCTREE(mainwin->folderview->ctree),
-                       mainwin->folderview->opened);
-               if (item) {
-                       summary_save_prefs_to_folderitem(
-                               mainwin->folderview->summaryview, item);
-                       prefs_common.last_opened_folder = 
-                               folder_item_get_identifier(item);
-               }
+       if((item = folderview_get_opened_item(mainwin->folderview)) != NULL) {
+               summary_save_prefs_to_folderitem(
+                       mainwin->summaryview, item);
+               prefs_common.last_opened_folder =
+                       folder_item_get_identifier(item);
        }
 
        /* save all state before exiting */