X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-local-folder-info.c;h=c818cca40f22d6473d2533ca19642beac15c24f6;hp=9ab4465ee1179a5b729b7faedfabba8c00450314;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=25cf2dcb2cafa1281f23363ad314cddf1cea12a3

diff --git a/src/modest-local-folder-info.c b/src/modest-local-folder-info.c
index 9ab4465..c818cca 100644
--- a/src/modest-local-folder-info.c
+++ b/src/modest-local-folder-info.c
@@ -41,7 +41,6 @@ typedef struct {
 const ModestLocalFolder ModestLocalFolderMap[] = {
 	{ TNY_FOLDER_TYPE_UNKNOWN,  "<unknown>",  N_("<Unknown>")},
 	{ TNY_FOLDER_TYPE_NORMAL,   "<normal>",   N_("<Normal>")},
-	{ TNY_FOLDER_TYPE_INBOX,    "inbox",      N_("mcen_me_folder_inbox")},
 	{ TNY_FOLDER_TYPE_OUTBOX,   "outbox",     N_("mcen_me_folder_outbox")},
 	{ TNY_FOLDER_TYPE_TRASH,    "trash",      N_("Trash")},
 	{ TNY_FOLDER_TYPE_JUNK,     "junk",       N_("Junk")},
@@ -49,11 +48,7 @@ const ModestLocalFolder ModestLocalFolderMap[] = {
 	{ TNY_FOLDER_TYPE_ROOT,     "<root>",     N_("<root>")},
 	{ TNY_FOLDER_TYPE_NOTES,    "notes",      N_("Notes")},
 	{ TNY_FOLDER_TYPE_DRAFTS,   "drafts",     N_("mcen_me_folder_drafts")},
-/* TODO: Do we want these? If so, they need a type ID: 
- * 	{ TNY_FOLDER_TYPE_OUTBOX,   "contacts",   N_("Contacts")},
-	{ TNY_FOLDER_TYPE_OUTBOX,   "calendar",   N_("Calendar")},
-*/
-	{ TNY_FOLDER_TYPE_ARCHIVE,  "archive",    N_("Archive")}
+	{ TNY_FOLDER_TYPE_ARCHIVE,  "archive",    N_("mcen_me_folder_archive")}
 };
 
 
@@ -105,15 +100,16 @@ modest_local_folder_info_get_type_display_name (TnyFolderType type)
 
 
 gchar *
-modest_local_folder_info_get_maildir_path (void)
+modest_local_folder_info_get_maildir_path (const gchar* location_filepath)
 {
-	return g_build_filename (g_get_home_dir(),
+	return g_build_filename (location_filepath ? location_filepath : g_get_home_dir(),
 				 MODEST_DIR,
 				 MODEST_LOCAL_FOLDERS_MAILDIR, 
 				 NULL);
 }
 
-gchar *modest_per_account_local_outbox_folder_info_get_maildir_path (const gchar* account_name)
+gchar*
+modest_per_account_local_outbox_folder_info_get_maildir_path (const gchar* account_name)
 {
 	/* This directory should contain an "outbox" child directory: */
 	return g_build_filename (g_get_home_dir(),
@@ -123,7 +119,8 @@ gchar *modest_per_account_local_outbox_folder_info_get_maildir_path (const gchar
 				 NULL);
 }
 
-gchar *modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (const gchar* account_name)
+gchar*
+modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (const gchar* account_name)
 {
 	gchar *path_to_account_folder = 
 		modest_per_account_local_outbox_folder_info_get_maildir_path(account_name);