Use folderview_freeze/thaw() functions outside of folderview.c.

[claws.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9368487f8945af91fb574cc801d80f841565a134..15b479f67244bfb41c85489bef16e5ed7b11c5aa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2016 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -80,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"
@@ -102,7 +102,7 @@
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "statusbar.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        #include "addressbook.h"
 #else
        #include "addressbook-dbus.h"
@@ -127,6 +127,7 @@
 #include "quicksearch.h"
 #include "advsearch.h"
 #include "avatars.h"
+#include "passwordstore.h"
 
 #ifdef HAVE_LIBETPAN
 #include "imap-thread.h"
@@ -202,6 +203,7 @@ static struct RemoteCmd {
        const gchar *subscribe_uri;
        const gchar *target;
        gboolean debug;
+       const gchar *geometry;
 } cmd;
 
 SessionStats session_stats;
@@ -1264,7 +1266,7 @@ int main(int argc, char *argv[])
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        addressbook_read_file();
 #else
        g_clear_error(&error);
@@ -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 ();
@@ -1466,6 +1471,19 @@ int main(int argc, char *argv[])
                        main_window_popup(mainwin);
        }
 
+       if (cmd.geometry != NULL) {
+               if (!gtk_window_parse_geometry(GTK_WINDOW(mainwin->window), cmd.geometry))
+                       g_warning("failed to parse geometry '%s'", cmd.geometry);
+               else {
+                       int width, height;
+
+                       if (sscanf(cmd.geometry, "%ux%u+", &width, &height) == 2)
+                               gtk_window_resize(GTK_WINDOW(mainwin->window), width, height);
+                       else
+                               g_warning("failed to parse geometry's width/height");
+               }
+       }
+
        if (!folder_have_mailbox()) {
                prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
@@ -1499,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 &&
@@ -1596,6 +1614,7 @@ static void exit_claws(MainWindow *mainwin)
 {
        gchar *filename;
        gboolean have_connectivity;
+       FolderItem *item;
 
        sc_exiting = TRUE;
 
@@ -1608,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 */
@@ -1631,7 +1643,8 @@ static void exit_claws(MainWindow *mainwin)
 
        prefs_common_write_config();
        account_write_config_all();
-#ifndef USE_NEW_ADDRBOOK
+       passwd_store_write_config();
+#ifndef USE_ALT_ADDRBOOK
        addressbook_export_to_file();
 #endif
        filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
@@ -1674,7 +1687,7 @@ static void exit_claws(MainWindow *mainwin)
        prefs_toolbar_done();
        avatars_done();
 
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        addressbook_destroy();
 #endif
        prefs_themes_done();
@@ -1947,6 +1960,8 @@ static void parse_cmd_opt(int argc, char *argv[])
                        g_print("%s\n", _("  --config-dir           output configuration directory"));
                        g_print("%s\n", _("  --alternate-config-dir [dir]\n"
                                          "                         use specified configuration directory"));
+                       g_print("%s\n", _("  --geometry -geometry WxH+X+Y\n"
+                                         "                         set geometry for main window"));
 
                        g_free(base);
                        exit(1);
@@ -1959,6 +1974,9 @@ static void parse_cmd_opt(int argc, char *argv[])
                        exit(0);
                } else if (!strncmp(argv[i], "--alternate-config-dir", sizeof "--alternate-config-dir" - 1) && i+1 < argc) {
                        set_rc_dir(argv[i+1]);
+               } else if (!strncmp(argv[i], "--geometry", sizeof "--geometry" - 1)
+                         || !strncmp(argv[i], "-geometry", sizeof "-geometry" - 1)) {
+                       cmd.geometry = (i+1 < argc)? argv[i+1]: NULL;
                } else if (!strncmp(argv[i], "--exit", 6) ||
                           !strncmp(argv[i], "--quit", 6) ||
                           !strncmp(argv[i], "-q", 2)) {