X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=e88524464c3a8fc8c596e70cc93439c414640ce3;hb=c56f787c45a8318f4b213b22b437b5a1b421d1c9;hp=bcf9ffae6322df154396fe1b6e32b8aaf371af9c;hpb=c3fa140bae7b51e3bca3ae33bf2b6f924cd9386f;p=modest diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index bcf9ffa..e885244 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -44,45 +45,48 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name) { gint type; gchar *folder; + gchar *dc_outbox = NULL; + gchar *dc_sent = NULL; + gchar *dc_drafts = NULL; g_return_val_if_fail (name, TNY_FOLDER_TYPE_UNKNOWN); type = TNY_FOLDER_TYPE_UNKNOWN; folder = g_utf8_strdown (name, strlen(name)); - - if (strcmp (folder, "inbox") == 0 || - strcmp (folder, _("inbox")) == 0 || - strcmp (folder, _("mcen_me_folder_inbox")) == 0) - type = TNY_FOLDER_TYPE_INBOX; - else if (strcmp (folder, "outbox") == 0 || - strcmp (folder, _("outbox")) == 0 || - strcmp (folder, _("mcen_me_folder_outbox")) == 0) + dc_outbox = g_utf8_strdown (_("mcen_me_folder_outbox"), -1); + dc_sent = g_utf8_strdown (_("mcen_me_folder_sent"), -1); + dc_drafts = g_utf8_strdown (_("mcen_me_folder_drafts"), -1); + +// if (strcmp (folder, "inbox") == 0 || +// strcmp (folder, _("inbox")) == 0 || +// strcmp (folder, _("mcen_me_folder_inbox")) == 0) +// type = TNY_FOLDER_TYPE_INBOX; + if (strcmp (folder, dc_outbox) == 0) type = TNY_FOLDER_TYPE_OUTBOX; - else if (g_str_has_prefix(folder, "junk") || - g_str_has_prefix(folder, _("junk"))) - type = TNY_FOLDER_TYPE_JUNK; - else if (g_str_has_prefix(folder, "trash") || - g_str_has_prefix(folder, _("trash"))) - type = TNY_FOLDER_TYPE_TRASH; - else if (g_str_has_prefix(folder, "sent") || - g_str_has_prefix(folder, _("sent")) || - strcmp (folder, _("mcen_me_folder_sent")) == 0) +// else if (g_str_has_prefix(folder, "junk") || +// g_str_has_prefix(folder, _("junk"))) +// type = TNY_FOLDER_TYPE_JUNK; +// else if (g_str_has_prefix(folder, "trash") || +// g_str_has_prefix(folder, _("trash"))) +// type = TNY_FOLDER_TYPE_TRASH; + else if (strcmp (folder, dc_sent) == 0) type = TNY_FOLDER_TYPE_SENT; - else if (g_str_has_prefix(folder, "draft") || - g_str_has_prefix(folder, _("draft")) || - strcmp (folder, _("mcen_me_folder_drafts")) == 0) + else if (strcmp (folder, dc_drafts) == 0) type = TNY_FOLDER_TYPE_DRAFTS; - else if (g_str_has_prefix(folder, "notes") || - g_str_has_prefix(folder, _("notes"))) - type = TNY_FOLDER_TYPE_NOTES; - else if (g_str_has_prefix(folder, "contacts") || - g_str_has_prefix(folder, _("contacts"))) - type = TNY_FOLDER_TYPE_CONTACTS; - else if (g_str_has_prefix(folder, "calendar") || - g_str_has_prefix(folder, _("calendar"))) - type = TNY_FOLDER_TYPE_CALENDAR; +// else if (g_str_has_prefix(folder, "notes") || +// g_str_has_prefix(folder, _("notes"))) +// type = TNY_FOLDER_TYPE_NOTES; +// else if (g_str_has_prefix(folder, "contacts") || +// g_str_has_prefix(folder, _("contacts"))) +// type = TNY_FOLDER_TYPE_CONTACTS; +// else if (g_str_has_prefix(folder, "calendar") || +// g_str_has_prefix(folder, _("calendar"))) +// type = TNY_FOLDER_TYPE_CALENDAR; g_free (folder); + g_free (dc_outbox); + g_free (dc_sent); + g_free (dc_drafts); return type; } @@ -92,14 +96,16 @@ TnyFolderType modest_tny_folder_guess_folder_type (const TnyFolder *folder) { TnyFolderType type; + + g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_UNKNOWN); - g_return_val_if_fail (folder, TNY_FOLDER_TYPE_UNKNOWN); - - type = tny_folder_get_folder_type (TNY_FOLDER (folder)); + if (modest_tny_folder_is_local_folder ((TnyFolder*)folder)) + type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder); + else + type = tny_folder_get_folder_type (TNY_FOLDER (folder)); if (type == TNY_FOLDER_TYPE_UNKNOWN) { const gchar *folder_name; - folder_name = tny_folder_get_name (TNY_FOLDER (folder)); type = modest_tny_folder_guess_folder_type_from_name (folder_name); } @@ -117,15 +123,16 @@ modest_tny_folder_get_rules (TnyFolder *folder) g_return_val_if_fail (TNY_IS_FOLDER(folder), -1); - if (modest_tny_folder_is_local_folder (folder)) { + if (modest_tny_folder_is_local_folder (folder) || + modest_tny_folder_is_memory_card_folder (folder)) { - type = modest_tny_folder_get_local_folder_type (folder); + type = modest_tny_folder_get_local_or_mmc_folder_type (folder); switch (type) { case TNY_FOLDER_TYPE_OUTBOX: case TNY_FOLDER_TYPE_SENT: - rules |= MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; case TNY_FOLDER_TYPE_DRAFTS: + rules |= MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; case TNY_FOLDER_TYPE_INBOX: case TNY_FOLDER_TYPE_JUNK: case TNY_FOLDER_TYPE_TRASH: @@ -144,8 +151,10 @@ modest_tny_folder_get_rules (TnyFolder *folder) } } else { ModestTransportStoreProtocol proto; - TnyAccount *account = - modest_tny_folder_get_account ((TnyFolder*)folder); + TnyFolderType folder_type; + TnyAccount *account; + + account = modest_tny_folder_get_account ((TnyFolder*)folder); if (!account) return -1; /* no account: nothing is allowed */ @@ -163,15 +172,26 @@ modest_tny_folder_get_rules (TnyFolder *folder) } g_object_unref (G_OBJECT(account)); + + /* Neither INBOX nor ROOT, nor ARCHIVE folders should me moveable */ + folder_type = modest_tny_folder_guess_folder_type (folder); + if ((folder_type == TNY_FOLDER_TYPE_INBOX) || + (folder_type == TNY_FOLDER_TYPE_ROOT) || + (folder_type == TNY_FOLDER_TYPE_ARCHIVE)) { + rules |= MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE; + rules |= MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE; + rules |= MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE; + } } return rules; } + gboolean modest_tny_folder_is_local_folder (TnyFolder *folder) { - g_return_val_if_fail (folder, FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); /* The merge folder is a special case, * used to merge the per-account local outbox folders. @@ -179,18 +199,50 @@ modest_tny_folder_is_local_folder (TnyFolder *folder) * We should do something more sophisticated if we * ever use TnyMergeFolder for anything else. */ - if (TNY_IS_MERGE_FOLDER (folder)) + if (TNY_IS_MERGE_FOLDER (folder)) { return TRUE; - + } + TnyAccount* account = tny_folder_get_account ((TnyFolder*)folder); - if (!account) + if (!account) { + g_warning ("folder without account"); return FALSE; - + } + /* Outbox is a special case, using a derived TnyAccount: */ if (MODEST_IS_TNY_OUTBOX_ACCOUNT (account)) { - g_object_unref (account); - return TRUE; + //g_warning ("BUG: should not be reached"); + /* should be handled with the MERGE_FOLDER above*/ + g_object_unref (G_OBJECT(account)); + return TRUE; + } + + const gchar* account_id = tny_account_get_id (account); + if (!account_id) { + g_warning ("BUG: account without account id"); + g_object_unref (G_OBJECT(account)); + return FALSE; } + + g_object_unref (G_OBJECT(account)); + return (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0); +} + +gboolean +modest_tny_folder_is_memory_card_folder (TnyFolder *folder) +{ + g_return_val_if_fail (folder, FALSE); + + /* 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)) + return FALSE; + + TnyAccount* account = tny_folder_get_account ((TnyFolder*)folder); + if (!account) + return FALSE; const gchar* account_id = tny_account_get_id (account); if (!account_id) @@ -198,15 +250,31 @@ modest_tny_folder_is_local_folder (TnyFolder *folder) g_object_unref (G_OBJECT(account)); - return (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0); + 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); + + is_local = ((modest_tny_folder_is_local_folder(folder)) || + (modest_tny_folder_is_memory_card_folder(folder))); + + + return !is_local; +} TnyFolderType -modest_tny_folder_get_local_folder_type (TnyFolder *folder) +modest_tny_folder_get_local_or_mmc_folder_type (TnyFolder *folder) { g_return_val_if_fail (folder, TNY_FOLDER_TYPE_UNKNOWN); - + g_return_val_if_fail (modest_tny_folder_is_local_folder(folder)|| + modest_tny_folder_is_memory_card_folder(folder), + TNY_FOLDER_TYPE_UNKNOWN); + /* The merge folder is a special case, * used to merge the per-account local outbox folders. * and can have no get_account() implementation. @@ -227,11 +295,7 @@ modest_tny_folder_get_local_folder_type (TnyFolder *folder) g_object_unref (parent_account); parent_account = NULL; } - - - g_return_val_if_fail (modest_tny_folder_is_local_folder(folder), - TNY_FOLDER_TYPE_UNKNOWN); - + /* we need to use the camel functions, because we want the * _full name_, that is, the full path name of the folder, * to distinguish between 'Outbox' and 'myfunkyfolder/Outbox' @@ -256,7 +320,7 @@ modest_tny_folder_is_outbox_for_account (TnyFolder *folder, TnyAccount *account) g_return_val_if_fail(folder, FALSE); g_return_val_if_fail(account, FALSE); - if (modest_tny_folder_get_local_folder_type (folder) != TNY_FOLDER_TYPE_OUTBOX) + if (modest_tny_folder_get_local_or_mmc_folder_type (folder) != TNY_FOLDER_TYPE_OUTBOX) return FALSE; return TRUE; @@ -305,7 +369,8 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header) return retval; } -TnyAccount *modest_tny_folder_get_account (TnyFolder *folder) +TnyAccount * +modest_tny_folder_get_account (TnyFolder *folder) { TnyAccount *account = NULL; @@ -314,8 +379,7 @@ TnyAccount *modest_tny_folder_get_account (TnyFolder *folder) * because it could be merging folders from multiple accounts. * So we assume that this is the local folders account: */ - account = modest_tny_account_store_get_local_folders_account ( - TNY_ACCOUNT_STORE (modest_runtime_get_account_store())); + account = modest_tny_account_store_get_local_folders_account (modest_runtime_get_account_store()); } else { account = tny_folder_get_account (folder); } @@ -323,3 +387,50 @@ TnyAccount *modest_tny_folder_get_account (TnyFolder *folder) return account; } +/* + * It's probably better to use a query to get the folders that match + * new_name but currently tinymail only provides a match by name using + * regular expressions and we want an exact matching. We're not using + * a regular expression for the exact name because we'd need first to + * escape @new_name and it's not easy sometimes. + * + * The code that uses the query is available in revision 3152. + */ +gboolean +modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, + const gchar *new_name) +{ + TnyList *subfolders = NULL; + TnyIterator *iter = NULL; + TnyFolder *folder = NULL; + GError *err = NULL; + gboolean same_subfolder = FALSE; + + g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), 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); + + same_subfolder = !strcmp(name, new_name); + + g_object_unref (folder); + tny_iterator_next(iter); + } + + /* free */ + if (iter != NULL) + g_object_unref (iter); + if (subfolders != NULL) + g_object_unref (subfolders); + + return same_subfolder; +}