X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=a5973b138046efd2285a78cc7febc986f4b7d41a;hp=1b678cb1d3ef3586004fe91dda6fe4272ffc191c;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=98ce2fb5d6f8046ec5ad84cc6b4e116b8458720e diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index 1b678cb..a5973b1 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -50,37 +50,31 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* name) 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) +// if (strcmp (folder, "inbox") == 0 || +// strcmp (folder, _("inbox")) == 0 || +// strcmp (folder, _("mcen_me_folder_inbox")) == 0) +// type = TNY_FOLDER_TYPE_INBOX; + if (strcmp (folder, _("mcen_me_folder_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, _("mcen_me_folder_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, _("mcen_me_folder_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); return type; @@ -96,7 +90,7 @@ modest_tny_folder_guess_folder_type (const TnyFolder *folder) g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_UNKNOWN); if (modest_tny_folder_is_local_folder ((TnyFolder*)folder)) - type = modest_tny_folder_get_local_folder_type ((TnyFolder*)folder); + type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder); else type = tny_folder_get_folder_type (TNY_FOLDER (folder)); @@ -122,7 +116,7 @@ modest_tny_folder_get_rules (TnyFolder *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: @@ -147,8 +141,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 */ @@ -166,15 +162,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. @@ -182,21 +189,27 @@ 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_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; } @@ -232,10 +245,13 @@ modest_tny_folder_is_memory_card_folder (TnyFolder *folder) 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. @@ -256,11 +272,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' @@ -285,7 +297,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; @@ -334,7 +346,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; @@ -343,12 +356,10 @@ 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); } return account; } -