X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=ee0f22446c31beb68e2504ee6fa9b598d4736726;hb=b8d794860f2d0f78c9aff5f295b1c325acbcbe88;hp=e011a99b4e30a02d459a843d06baa877c201dafb;hpb=f236236d2478e3ad1fb68a47e2c4e32f706f8e66;p=modest diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index e011a99..ee0f224 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -30,12 +30,13 @@ #include #include #include +#include #include +#include #include #include #include #include -#include #include #include #include @@ -58,16 +59,40 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* full_name) TnyFolderType -modest_tny_folder_guess_folder_type (const TnyFolder *folder) +modest_tny_folder_guess_folder_type (TnyFolder *folder) { TnyFolderType type; g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_INVALID); - if (modest_tny_folder_is_local_folder ((TnyFolder*)folder)) - type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder); + if (modest_tny_folder_is_local_folder (folder) || + modest_tny_folder_is_memory_card_folder (folder)) + type = modest_tny_folder_get_local_or_mmc_folder_type (folder); else type = tny_folder_get_folder_type (TNY_FOLDER (folder)); + + /* Fallback code, some servers (Dovecot in some versions) + report incorrectly that the INBOX folder is a normal + folder. Really ugly code but... */ + if (type == TNY_FOLDER_TYPE_NORMAL) { + TnyFolderStore *parent = tny_folder_get_folder_store (folder); + if (parent) { + if (TNY_IS_ACCOUNT (parent)) { + gchar *downcase = + g_ascii_strdown (tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder)), + -1); + + if ((strlen (downcase) == 5) && + !strncmp (downcase, "inbox", 5)) + type = TNY_FOLDER_TYPE_INBOX; + if ((strlen (downcase) == 7) && + !strncmp (downcase, "archive", 7)) + type = TNY_FOLDER_TYPE_ARCHIVE; + g_free (downcase); + } + g_object_unref (parent); + } + } if (type == TNY_FOLDER_TYPE_UNKNOWN) { const gchar *folder_name = @@ -83,7 +108,7 @@ modest_tny_folder_guess_folder_type (const TnyFolder *folder) const gchar* -modest_tny_folder_get_help_id (const TnyFolder *folder) +modest_tny_folder_get_help_id (TnyFolder *folder) { TnyFolderType type; const gchar* help_id = NULL; @@ -147,17 +172,20 @@ modest_tny_folder_get_rules (TnyFolder *folder) break; } } else { - ModestTransportStoreProtocol proto; + ModestProtocolRegistry *protocol_registry; + ModestProtocolType protocol_type; TnyFolderType folder_type; TnyAccount *account; + protocol_registry = modest_runtime_get_protocol_registry (); + account = modest_tny_folder_get_account ((TnyFolder*)folder); if (!account) return -1; /* no account: nothing is allowed */ - proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account)); + protocol_type = modest_tny_account_get_protocol_type (account); - if (proto == MODEST_PROTOCOL_STORE_IMAP) { + if (modest_protocol_registry_protocol_type_has_tag (protocol_registry, protocol_type, MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS)) { rules = 0; } else { /* pop, nntp, ... */ @@ -231,11 +259,9 @@ gboolean modest_tny_folder_is_memory_card_folder (TnyFolder *folder) { g_return_val_if_fail (folder, FALSE); - g_return_val_if_fail (modest_tny_folder_guess_folder_type (folder) != - TNY_FOLDER_TYPE_INVALID, FALSE); - - /* The merge folder is a special case, - * used to merge the per-account local outbox folders. + + /* The merge folder is a special case, + * used to merge the per-account local outbox folders. * and can have no get_account() implementation. */ if (TNY_IS_MERGE_FOLDER (folder)) @@ -246,20 +272,22 @@ modest_tny_folder_is_memory_card_folder (TnyFolder *folder) return FALSE; const gchar* account_id = tny_account_get_id (account); - if (!account_id) + if (!account_id) { + g_object_unref (account); return FALSE; + } + + g_object_unref (account); - g_object_unref (G_OBJECT(account)); - return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0); -} +} gboolean modest_tny_folder_is_remote_folder (TnyFolder *folder) { gboolean is_local = TRUE; - g_return_val_if_fail (folder, FALSE); + g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE); is_local = ((modest_tny_folder_is_local_folder(folder)) || (modest_tny_folder_is_memory_card_folder(folder))); @@ -329,7 +357,7 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header) { TnyFolder *folder; gchar *url, *retval; - const gchar *uid; + gchar *uid; g_return_val_if_fail (TNY_IS_HEADER (header), NULL); @@ -338,9 +366,10 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header) return NULL; url = tny_folder_get_url_string (folder); - uid = tny_header_get_uid (header); + uid = tny_header_dup_uid (header); retval = g_strjoin ("/", url, uid, NULL); + g_free (uid); g_free (url); g_object_unref (folder); @@ -352,6 +381,8 @@ TnyAccount * modest_tny_folder_get_account (TnyFolder *folder) { TnyAccount *account = NULL; + + g_return_val_if_fail (TNY_IS_FOLDER(folder), NULL); if (TNY_IS_MERGE_FOLDER (folder)) { /* TnyMergeFolder does not support get_account(), @@ -391,7 +422,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, /* Get direct subfolders */ subfolders = tny_simple_list_new (); - tny_folder_store_get_folders (parent, subfolders, NULL, &err); + tny_folder_store_get_folders (parent, subfolders, NULL, FALSE, &err); /* Check names */ iter = tny_list_create_iterator (subfolders); @@ -402,6 +433,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, folder = (TnyFolder*)tny_iterator_get_current (iter); if (!folder || ! TNY_IS_FOLDER(folder)) { g_warning ("%s: invalid folder", __FUNCTION__); + tny_iterator_next (iter); continue; } @@ -409,6 +441,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, if (!name) { g_warning ("%s: folder name == NULL", __FUNCTION__); g_object_unref (folder); + tny_iterator_next (iter); continue; } @@ -462,3 +495,38 @@ modest_tny_folder_is_ancestor (TnyFolder *folder, } return found; } + +gchar * +modest_tny_folder_get_display_name (TnyFolder *folder) +{ + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + gchar *fname; + + g_return_val_if_fail (TNY_IS_FOLDER (folder), NULL); + + fname = g_strdup (tny_folder_get_name (folder)); + type = tny_folder_get_folder_type (folder); + + if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder)) || + modest_tny_folder_is_memory_card_folder (TNY_FOLDER (folder))) { + type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (folder)); + if (type != TNY_FOLDER_TYPE_UNKNOWN) { + g_free (fname); + fname = g_strdup (modest_local_folder_info_get_type_display_name (type)); + } + } else { + /* Sometimes an special folder is reported by the server as + NORMAL, like some versions of Dovecot */ + if (type == TNY_FOLDER_TYPE_NORMAL || + type == TNY_FOLDER_TYPE_UNKNOWN) { + type = modest_tny_folder_guess_folder_type (TNY_FOLDER (folder)); + } + } + + if (type == TNY_FOLDER_TYPE_INBOX) { + g_free (fname); + fname = g_strdup (_("mcen_me_folder_inbox")); + } + + return fname; +}