// strcmp (folder, _("inbox")) == 0 ||
// strcmp (folder, _("mcen_me_folder_inbox")) == 0)
// type = TNY_FOLDER_TYPE_INBOX;
- if (strcmp (folder, "outbox") == 0 ||
- strcmp (folder, _("outbox")) == 0 ||
- strcmp (folder, _("mcen_me_folder_outbox")) == 0)
+ 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")))
// 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 (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")))
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));
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:
}
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;
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.
* 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;
}
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.
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'
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;
return retval;
}
-TnyAccount *modest_tny_folder_get_account (TnyFolder *folder)
+TnyAccount *
+modest_tny_folder_get_account (TnyFolder *folder)
{
TnyAccount *account = NULL;
* 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;
}
-