X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=9f188dcd774313d1835c53a50f4a131b3df64f39;hp=8f4108eec1f32f43c4677a3cfa4af9a2e7a70f14;hb=7691addfd0661f493672b2fab5274ca28612707d;hpb=db884009546eaa55ea71bcd46db03931dff08b98

diff --git a/src/modest-init.c b/src/modest-init.c
index 8f4108e..9f188dc 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -319,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;
@@ -441,7 +441,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 +583,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 +601,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 +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);