* Fixed some strange behaviour on send-queues and

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 8f4108e..690f7c8 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -190,6 +190,9 @@ modest_init (int argc, char *argv[])
        init_debug_g_type();
        init_debug_logging();
 
+       /* initialize the prng, we need it when creating random files */
+       srandom((int)getpid());
+       
        if (!gnome_vfs_initialized()) {
                if (!gnome_vfs_init ()) {
                        g_printerr ("modest: failed to init gnome-vfs\n");
@@ -319,7 +322,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type,
 
        if ( col_num > 0 ) {
                gint sort_col_id;
-               if (cols[i].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
+               if (cols[0].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
                        sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
                else
                        sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
@@ -441,7 +444,8 @@ modest_init_local_folders (const gchar* location_filepath)
                 */
 
                gchar *dir = g_build_filename (maildir_path,
-                               "Archive", NULL);                       
+                                              modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE),
+                                              NULL);
                const gboolean created = modest_init_one_local_folder (dir);
                g_free(dir);
                        
@@ -582,8 +586,8 @@ init_stock_icons (void)
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
 /*                     { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
                        { MODEST_STOCK_REPLY, "reply", 0, 0, NULL },
-                       { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL },
-                       { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL },
+/*                     { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL }, */
+/*                     { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL }, */
                        { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, 
 /*                     { MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */
 /*                     { MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */
@@ -600,8 +604,8 @@ init_stock_icons (void)
                        MODEST_TOOLBAR_ICON_NEW_MAIL,
 /*                     MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
                        MODEST_TOOLBAR_ICON_REPLY,      
-                       MODEST_TOOLBAR_ICON_REPLY_ALL,
-                       MODEST_TOOLBAR_ICON_FORWARD,
+/*                     MODEST_TOOLBAR_ICON_REPLY_ALL, */
+/*                     MODEST_TOOLBAR_ICON_FORWARD, */
                        MODEST_TOOLBAR_ICON_DELETE, 
 /*                     MODEST_TOOLBAR_ICON_NEXT, */
 /*                     MODEST_TOOLBAR_ICON_PREV, */
@@ -645,7 +649,7 @@ init_stock_icons (void)
                                g_object_unref (transparent);
                        }
                        else
-                               g_warning ("failed to load %s icon", items_names[i]);
+                               g_warning ("Modest: %s: failed to load %s icon", __FUNCTION__, items_names[i]);
                }
                /* Drop our reference to the factory, GTK will hold a reference. */
                g_object_unref (factory);
@@ -656,23 +660,32 @@ init_stock_icons (void)
 static void
 init_default_settings (ModestConf *conf)
 {
-       if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL);
+       /* Show toolbar keys */
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
 
-       if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
        
+       if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+       /* Editor keys */
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
 
-/* Not used:
-       if (!modest_conf_key_exists (conf, MODEST_CONF_CONNECT_AT_STARTUP, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_CONNECT_AT_STARTUP, TRUE, NULL);
-*/
-
        /* Global settings */
        if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);