X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-local-folder-info.c;h=bd91821c3c1cc2e3ed46aa267534489eac77eaef;hb=bb790bd8b50e81a1e965341d010864d6000c5b38;hp=dfdfd6ca95d124062d91a51f530e3dcec40a2be0;hpb=1f6bcb80a516f8212bc404ba39165ef8dcde423e;p=modest

diff --git a/src/modest-local-folder-info.c b/src/modest-local-folder-info.c
index dfdfd6c..bd91821 100644
--- a/src/modest-local-folder-info.c
+++ b/src/modest-local-folder-info.c
@@ -32,41 +32,48 @@
 #include <modest-local-folder-info.h>
 
 typedef struct {
-	ModestLocalFolderType   type;
-	const gchar             *name;
-	const gchar             *display_name;
+	TnyFolderType   type;
+	const gchar     *name;
+	const gchar     *display_name;
 } ModestLocalFolder;
 
 const ModestLocalFolder ModestLocalFolderMap[] = {
-	{ MODEST_LOCAL_FOLDER_TYPE_JUNK,    "junk",    N_("Junk")},
-	{ MODEST_LOCAL_FOLDER_TYPE_TRASH,   "trash",   N_("Trash")},
-	{ MODEST_LOCAL_FOLDER_TYPE_DRAFTS,  "drafts",  N_("Drafts")},
-	{ MODEST_LOCAL_FOLDER_TYPE_SENT,    "sent",    N_("Sent")},
-	{ MODEST_LOCAL_FOLDER_TYPE_OUTBOX,  "outbox",  N_("Outbox")},
-	{ MODEST_LOCAL_FOLDER_TYPE_ARCHIVE, "archive", N_("Archive")}
+	{ 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")},
+	{ TNY_FOLDER_TYPE_SENT,     "sent",       N_("mcen_me_folder_sent")},
+	{ TNY_FOLDER_TYPE_ROOT,     "<root>",     N_("<root>")},
+	{ TNY_FOLDER_TYPE_NOTES,    "notes",      N_("Notes")},
+	{ TNY_FOLDER_TYPE_DRAFTS,   "drafts",     N_("mcen_me_folder_drafts")},
+	{ TNY_FOLDER_TYPE_OUTBOX,   "contacts",   N_("Contacts")},
+	{ TNY_FOLDER_TYPE_OUTBOX,   "calendar",   N_("Calendar")},
+	{ TNY_FOLDER_TYPE_ARCHIVE,  "archive",    N_("Archive")}
 };
 
 
-ModestLocalFolderType
+TnyFolderType
 modest_local_folder_info_get_type (const gchar *name)
 {
 	int i;
-
-	g_return_val_if_fail (name, MODEST_LOCAL_FOLDER_TYPE_UNKNOWN);
+	g_return_val_if_fail (name, TNY_FOLDER_TYPE_UNKNOWN);
 
 	for (i = 0; i != G_N_ELEMENTS(ModestLocalFolderMap); ++i) {
 		if (strcmp (ModestLocalFolderMap[i].name, name) == 0)
 			return ModestLocalFolderMap[i].type;
 	}
-	return MODEST_LOCAL_FOLDER_TYPE_UNKNOWN;
+	return TNY_FOLDER_TYPE_UNKNOWN;
 }
 
+
 const gchar*
-modest_local_folder_info_get_type_name (ModestLocalFolderType type)
+modest_local_folder_info_get_type_name (TnyFolderType type)
 {
 	int i = 0;
-	g_return_val_if_fail (type > MODEST_LOCAL_FOLDER_TYPE_UNKNOWN &&
-			      type < MODEST_LOCAL_FOLDER_TYPE_NUM, NULL);
+	g_return_val_if_fail (type >= TNY_FOLDER_TYPE_UNKNOWN &&
+			      type <  TNY_FOLDER_TYPE_NUM, NULL);
 	
 	for (i = 0; i != G_N_ELEMENTS(ModestLocalFolderMap); ++i) {
 		if (ModestLocalFolderMap[i].type == type)
@@ -76,11 +83,11 @@ modest_local_folder_info_get_type_name (ModestLocalFolderType type)
 }
 
 const gchar*
-modest_local_folder_info_get_type_display_name (ModestLocalFolderType type)
+modest_local_folder_info_get_type_display_name (TnyFolderType type)
 {
 	int i = 0;
-	g_return_val_if_fail (type > MODEST_LOCAL_FOLDER_TYPE_UNKNOWN &&
-			      type < MODEST_LOCAL_FOLDER_TYPE_NUM, NULL);
+	g_return_val_if_fail (type >= TNY_FOLDER_TYPE_UNKNOWN &&
+			      type <  TNY_FOLDER_TYPE_NUM, NULL);
 	
 	for (i = 0; i != G_N_ELEMENTS(ModestLocalFolderMap); ++i) {
 		if (ModestLocalFolderMap[i].type == type)
@@ -90,3 +97,12 @@ modest_local_folder_info_get_type_display_name (ModestLocalFolderType type)
 }
 
 
+gchar *
+modest_local_folder_info_get_maildir_path (void)
+{
+	return g_build_filename (g_get_home_dir(),
+				 MODEST_DIR,
+				 MODEST_LOCAL_FOLDERS_MAILDIR, 
+				 NULL);
+}
+