X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-init.c;h=f13483f662491b636146918d6235b55aec904653;hb=8125ec9d64e509b2238ff58a8cd905791f717c3e;hp=2580951b60eb3a38096c9c29ad75f567bb2e9ade;hpb=ef8694f7d80505ee356897d45d9757d7b68a6f5c;p=modest

diff --git a/src/modest-init.c b/src/modest-init.c
index 2580951..f13483f 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -61,6 +61,7 @@ static void     init_debug_g_type (void);
 static void     init_debug_logging (void);
 static void     init_default_settings (ModestConf *conf);
 static void     init_device_name (ModestConf *conf);
+static gboolean init_ui (gint argc, gchar** argv);
 
 /*
  * defaults for the column headers
@@ -171,8 +172,9 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes
 		return result;
 }
 
+
 gboolean
-modest_init_init_core (void)
+modest_init (int argc, char *argv[])
 {
 	gboolean reset;
 	static gboolean invoked = FALSE;
@@ -183,22 +185,28 @@ modest_init_init_core (void)
 		return FALSE;
 	} else
 		invoked = TRUE;
-	
+
 	init_i18n();
 	init_debug_g_type();
 	init_debug_logging();
+
+	if (!gnome_vfs_initialized()) {
+		if (!gnome_vfs_init ()) {
+			g_printerr ("modest: failed to init gnome-vfs\n");
+			return FALSE;
+		}
+	}
 	
 	if (!modest_runtime_init()) {
 		modest_init_uninit ();
 		g_printerr ("modest: failed to initialize the modest runtime\n");
 		return FALSE;
 	}
-
-
+	
 	/* do an initial guess for the device name */
 	init_device_name (modest_runtime_get_conf());
-
-	if (!modest_platform_init()) {
+	
+	if (!modest_platform_init(argc, argv)) {
 		modest_init_uninit ();
 		g_printerr ("modest: failed to run platform-specific initialization\n");
 		return FALSE;
@@ -223,20 +231,21 @@ modest_init_init_core (void)
 		modest_init_uninit ();
 		g_printerr ("modest: failed to init default account\n");
 		return FALSE;
+	}	
+	
+	if (!init_ui (argc, argv)) {
+		modest_init_uninit ();
+		g_printerr ("modest: failed to init ui\n");
+		return FALSE;
 	}
 	
 	return TRUE;
 }
 
 
-gboolean
-modest_init_init_ui (gint argc, gchar** argv)
+static gboolean
+init_ui (gint argc, gchar** argv)
 {
-	if (!gtk_init_check(&argc, &argv)) {
-		g_printerr ("modest: failed to initialize graphical ui\n");
-		return FALSE;
-	}
-
 	/* Set application name */
 	g_set_application_name (modest_platform_get_app_name());
 	/* g_message (modest_platform_get_app_name()); */
@@ -244,11 +253,10 @@ modest_init_init_ui (gint argc, gchar** argv)
 	/* Init stock icons */
 	init_stock_icons ();
 
-	/* Init notification system */
-	#ifndef MODEST_HILDON_VERSION_0
+		/* Init notification system */
+#ifdef MODEST_HAVE_HILDON_NOTIFY
 	notify_init ("Basics");
-	#endif
-
+#endif
 	return TRUE;
 }
 
@@ -258,7 +266,10 @@ modest_init_uninit (void)
 {
 	if (!modest_runtime_uninit())
 		g_printerr ("modest: failed to uninit runtime\n");
-     		
+
+	if (gnome_vfs_initialized())
+		gnome_vfs_shutdown ();
+	
 	return TRUE;
 }
 
@@ -292,6 +303,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type,
 	 * there was nothing before */
 	if (!overwrite &&  modest_conf_key_exists(conf, key, NULL)) {
 		g_free (key);
+		g_free (sort_key);
 		return TRUE;
 	}
 
@@ -307,7 +319,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;
@@ -419,15 +431,32 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
 gboolean
 modest_init_local_folders (const gchar* location_filepath)
 {	
+	gboolean retval = TRUE;
+
 	gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath);
 
 	if (location_filepath) {
-		/* For instance, for memory card, just create the top-level .modest folder: */
+		/* For instance, for memory card, just create the top-level .modest folder
+		 * and one "archive" folder (so that messages can be put somewhere):
+		 */
+
+		gchar *dir = g_build_filename (maildir_path,
+					       modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE),
+					       NULL);
+		const gboolean created = modest_init_one_local_folder (dir);
+		g_free(dir);
+			
+		if (!created) {
+			retval = FALSE;
+		}
+
+		#if 0
+		/* Do this if we only create the top-level dir: */
 		if (g_mkdir_with_parents (maildir_path, 0755) < 0) {
 			g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath);
-			g_free (maildir_path);
-			return FALSE;
+			retval = FALSE;
 		}
+		#endif
 	}
 	else {
 		/* Create each of the standard on-disk folders.
@@ -441,14 +470,13 @@ modest_init_local_folders (const gchar* location_filepath)
 			g_free(dir);
 			
 			if (!created) {
-				g_free (maildir_path);
-				return FALSE;
+				retval = FALSE;
 			}
 		}
 	}
 	
 	g_free (maildir_path);
-	return TRUE;
+	return retval;
 }
 
 /**
@@ -618,7 +646,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);
@@ -641,8 +669,10 @@ init_default_settings (ModestConf *conf)
 	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))