X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=c6225eec436313371911ba48b7ef3491b1de4c53;hp=e3f54de6bab3b2f7d1933ed975cca0e08d1d3b58;hb=2ce1e036cfbf6ded802897028f4b3b5ababa29e2;hpb=efd56b78891cdefc321f6c4896e3f7f1bd771a1f

diff --git a/src/modest-init.c b/src/modest-init.c
index e3f54de..c6225ee 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -50,8 +50,9 @@
 #include "modest-tny-msg.h"
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
+#include "modest-text-utils.h"
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 #include "modest-hildon-includes.h"
 #endif
 #include <locale.h>
@@ -80,9 +81,9 @@ typedef struct {
 
 
 static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
+static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
 
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
-	{MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
 	{MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
 	{MODEST_HEADER_VIEW_COLUMN_FROM,    80, 0},
 	{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -95,7 +96,6 @@ static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
-	{MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
 	{MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
 	{MODEST_HEADER_VIEW_COLUMN_TO,    80, 0},
 	{MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -112,7 +112,7 @@ static const FolderCols SENT_COLUMNS_TWOLINES[] = {
 	{MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
 };
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 static const TnyFolderType LOCAL_FOLDERS[] = {
 /*	TNY_FOLDER_TYPE_OUTBOX, */
 	TNY_FOLDER_TYPE_DRAFTS,
@@ -126,7 +126,7 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
 	TNY_FOLDER_TYPE_TRASH,
 	TNY_FOLDER_TYPE_ARCHIVE	
 };
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_TOOLKIT_GTK */
 
 static GList*
 new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
@@ -184,7 +184,7 @@ static gboolean
 force_ke_recv_load (void)
 {
 	if (strcmp ("cerm_device_memory_full",
-		    dgettext("ke-recv", "cerm_device_memory_full")) == 0) {
+		    _KR("cerm_device_memory_full")) == 0) {
 		g_warning ("%s: cannot get translation for cerm_device_memory_full",
 			   __FUNCTION__);
 		return FALSE;
@@ -233,6 +233,8 @@ modest_init (int argc, char *argv[])
 		return FALSE;
 	}
 	
+	modest_plugin_factory_load_all (modest_runtime_get_plugin_factory ());
+
 	/* do an initial guess for the device name */
 	init_device_name (modest_runtime_get_conf());
 	
@@ -297,15 +299,15 @@ modest_init_uninit (void)
 	if (!_is_initialized)
 		return TRUE; 
 	
-	if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
-		gnome_vfs_shutdown ();
-		
 	if (!modest_runtime_uninit())
 		g_printerr ("modest: failed to uninit runtime\n");
 
 	if (!modest_platform_uninit())
 		g_printerr ("modest: failed to uninit platform\n");
 	
+	if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
+		gnome_vfs_shutdown ();
+
 	_is_initialized = FALSE;
 	return TRUE;
 }
@@ -428,7 +430,16 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
 	/* if we're not in overwrite mode, only write stuff it
 	 * there was nothing before */
 	if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-		modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
+		modest_conf_set_float (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
+	
+	g_free (key);
+
+	key = _modest_widget_memory_get_keyname (MODEST_CONF_MSG_PANED_KEY, 
+						 MODEST_WIDGET_MEMORY_PARAM_POS);
+	/* if we're not in overwrite mode, only write stuff it
+	 * there was nothing before */
+	if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
+		modest_conf_set_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
 	
 	g_free (key);
 	return TRUE;
@@ -615,10 +626,10 @@ init_stock_icons (void)
 		gint i;
 
 		static GtkStockItem items[] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 			{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
 			{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
 			{ MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
 			{ MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
 			{ MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
@@ -633,10 +644,10 @@ init_stock_icons (void)
 		};
       
 		static gchar *items_names [] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 			MODEST_TOOLBAR_ICON_SORT,
 			MODEST_TOOLBAR_ICON_REFRESH,
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
 			MODEST_TOOLBAR_ICON_SPLIT_VIEW,
 			MODEST_TOOLBAR_ICON_MAIL_SEND,
 			MODEST_TOOLBAR_ICON_NEW_MAIL,
@@ -665,7 +676,7 @@ init_stock_icons (void)
 		/* Register icons to accompany stock items */
 		for (i = 0; i < G_N_ELEMENTS (items); i++) {
 
-#ifdef MODEST_PLATFORM_MAEMO  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
+#ifndef MODEST_PLATFORM_GTK  
 			pixbuf = gtk_icon_theme_load_icon (current_theme,
 							   items_names[i],
 							   26,
@@ -719,7 +730,7 @@ init_default_settings (ModestConf *conf)
 
 	/* Editor keys */
 	if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
-		modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+		modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, FALSE, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
 		modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
@@ -762,7 +773,7 @@ init_device_name (ModestConf *conf)
 	gchar *devname = NULL;
 	
 	if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {
-		g_printerr ("modest: failed to read hostname\n");
+		g_warning ("%s: failed to read hostname\n", __FUNCTION__);
 		modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,
 					MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
 					NULL);