X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=57e865aca0c7cea4aef4420b50f8dc66c17802b6;hp=ff32e0ebba24959a7c9fa229d82421f8abb0d5bd;hb=ad105e093abd2bd0d2ce770f5570cdc29fbb5d42;hpb=4917dae327fb275f620961d4009762cd22b7e71e diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index ff32e0e..57e865a 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -31,13 +31,14 @@ #include #include #include +#include #include #include #include #include -#include #include #include +#include /* make sure you use the *full* name, because foo/drafts is not the same as drafts */ @@ -57,16 +58,37 @@ 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; + g_free (downcase); + } + g_object_unref (parent); + } + } if (type == TNY_FOLDER_TYPE_UNKNOWN) { const gchar *folder_name = @@ -146,17 +168,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, ... */ @@ -230,8 +255,6 @@ 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. @@ -245,10 +268,12 @@ 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 (G_OBJECT(account)); + g_object_unref (account); return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0); } @@ -258,7 +283,7 @@ 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))); @@ -328,7 +353,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); @@ -337,9 +362,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); @@ -351,6 +377,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(), @@ -376,30 +404,58 @@ modest_tny_folder_get_account (TnyFolder *folder) */ gboolean modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, - const gchar *new_name) + const gchar *new_name, + gboolean non_strict) { TnyList *subfolders = NULL; TnyIterator *iter = NULL; TnyFolder *folder = NULL; GError *err = NULL; - gboolean same_subfolder = FALSE; + gboolean has_name = FALSE; g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), FALSE); - + g_return_val_if_fail (new_name, FALSE); + /* Get direct subfolders */ subfolders = tny_simple_list_new (); tny_folder_store_get_folders (parent, subfolders, NULL, &err); /* Check names */ iter = tny_list_create_iterator (subfolders); - while (!tny_iterator_is_done (iter) && !same_subfolder) { - const gchar *name = NULL; - - folder = TNY_FOLDER(tny_iterator_get_current (iter)); - name = tny_folder_get_name (folder); + while (!tny_iterator_is_done (iter) && !has_name) { + + const gchar *name; + + folder = (TnyFolder*)tny_iterator_get_current (iter); + if (!folder || ! TNY_IS_FOLDER(folder)) { + g_warning ("%s: invalid folder", __FUNCTION__); + continue; + } - same_subfolder = !strcmp(name, new_name); + name = tny_folder_get_name (folder); + if (!name) { + g_warning ("%s: folder name == NULL", __FUNCTION__); + g_object_unref (folder); + continue; + } + /* is it simply the same folder name? */ + if (strcmp (name, new_name) == 0) + has_name = TRUE; + /* or is it the same when ignoring case (non-strict mode)? */ + else if (non_strict && modest_text_utils_utf8_strcmp (name, new_name, TRUE) == 0) + has_name = TRUE; + /* or is the name equal to the display name of some folder, in the current locale? */ + else if (non_strict) { + TnyFolderType type = modest_tny_folder_guess_folder_type (folder); + if (type != TNY_FOLDER_TYPE_INVALID && type != TNY_FOLDER_TYPE_NORMAL) + has_name = !(modest_text_utils_utf8_strcmp (modest_local_folder_info_get_type_display_name (type), + new_name, + TRUE)); + } else { + has_name = FALSE; + } + g_object_unref (folder); tny_iterator_next(iter); } @@ -410,7 +466,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, if (subfolders != NULL) g_object_unref (subfolders); - return same_subfolder; + return has_name; } gboolean