Use folderview_grab_focus() outside of folderview.c.

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c657e8f38098291f8b97340e03add2a31575f5bb..987bc6830e1dd8085a15aefb2fbb85aec95830f5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -79,6 +79,7 @@
 #include "prefs_fonts.h"
 #include "prefs_image_viewer.h"
 #include "prefs_message.h"
+#include "prefs_migration.h"
 #include "prefs_receive.h"
 #include "prefs_msg_colors.h"
 #include "prefs_quote.h"
@@ -126,6 +127,7 @@
 #include "quicksearch.h"
 #include "advsearch.h"
 #include "avatars.h"
+#include "passwordstore.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -1277,7 +1279,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();
@@ -1298,9 +1300,10 @@ 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();
        prefs_account_init();
        account_read_config_all();
 
@@ -1455,6 +1458,8 @@ int main(int argc, char *argv[])
                g_slist_free(plug_list);
        }
 
+       prefs_update_config_version();
+
        if (never_ran) {
                prefs_common_write_config();
                plugin_load_standard_plugins ();
@@ -1512,7 +1517,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 &&
@@ -1530,8 +1535,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);
@@ -1609,6 +1614,7 @@ static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
        gboolean have_connectivity;
+       FolderItem *item;
 
        sc_exiting = TRUE;
 
@@ -1621,18 +1627,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 */
@@ -1644,6 +1643,7 @@ static void exit_claws(MainWindow *mainwin)
 
        prefs_common_write_config();
        account_write_config_all();
+       passwd_store_write_config();
 #ifndef USE_ALT_ADDRBOOK
        addressbook_export_to_file();
 #endif