X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=9b13e7548ae1194dd9e315290e18020d8e5a0f75;hp=588c1f00856a6efab38519f9fe979b667224457e;hb=152ee6945dc5142b5e63f2a6ac6efc2dbb94df0c;hpb=f726ecf999c430784e0c21150304477c98774da0 diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index 588c1f0..9b13e75 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -90,7 +91,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)); @@ -116,7 +117,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: @@ -163,10 +164,11 @@ modest_tny_folder_get_rules (TnyFolder *folder) } g_object_unref (G_OBJECT(account)); - /* Neither INBOX not ROOT folders should me moveable */ + /* 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_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; @@ -175,6 +177,7 @@ modest_tny_folder_get_rules (TnyFolder *folder) return rules; } + gboolean modest_tny_folder_is_local_folder (TnyFolder *folder) @@ -187,21 +190,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; } @@ -235,12 +244,28 @@ modest_tny_folder_is_memory_card_folder (TnyFolder *folder) 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. @@ -261,11 +286,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' @@ -290,7 +311,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; @@ -339,7 +360,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; @@ -348,8 +370,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); } @@ -357,3 +378,28 @@ TnyAccount *modest_tny_folder_get_account (TnyFolder *folder) return account; } +gboolean +modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, + const gchar *name) +{ + TnyList *list; + TnyFolderStoreQuery *query; + guint length; + + g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), FALSE); + g_return_val_if_fail (name, FALSE); + + /* Create the query */ + list = tny_simple_list_new (); + query = tny_folder_store_query_new (); + tny_folder_store_query_add_item (query, name, + TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME); + + /* Get subfolders */ + tny_folder_store_get_folders (parent, list, query, NULL); + length = tny_list_get_length (list); + g_object_unref (query); + g_object_unref (list); + + return (length > 0) ? TRUE : FALSE; +}