From 94bf2a181e8b2644f037246b2fc3a70c865c22e2 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 20 Oct 2008 10:44:20 +0000 Subject: [PATCH] * src/modest-tny-local-folders-account.c, src/dbus_api/modest-dbus-callbacks.c, src/modest-tny-folder.c, src/modest-search.c, src/modest-mail-operation.c, src/modest-tny-account-store.c, src/modest-tny-account.c: Revert the commit 6008 (that adapted modest to tinymail new API, as this change has been also reverted in tinymail). pmo-trunk-r6105 --- src/dbus_api/modest-dbus-callbacks.c | 1 - src/modest-mail-operation.c | 4 ++-- src/modest-search.c | 4 ++-- src/modest-tny-account-store.c | 4 ++-- src/modest-tny-account.c | 6 +++--- src/modest-tny-folder.c | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 0289eb6..9832c3c 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -1673,7 +1673,6 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list) tny_folder_store_get_folders (folder_store, all_folders, NULL /* query */, - FALSE, NULL /* error */); TnyIterator *iter = tny_list_create_iterator (all_folders); diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 79a3d7e..8707d0e 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -1657,7 +1657,7 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, /* Add pending call */ info->pending_calls++; - tny_folder_store_get_folders_async (folder, folders, NULL, FALSE, + tny_folder_store_get_folders_async (folder, folders, NULL, recurse_folders_async_cb, NULL, info); g_object_unref (folders); @@ -1808,7 +1808,7 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* Get all folders and continue in the callback */ folders = tny_simple_list_new (); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account), - folders, NULL, FALSE, + folders, NULL, recurse_folders_async_cb, NULL, info); g_object_unref (folders); diff --git a/src/modest-search.c b/src/modest-search.c index 841fa52..6146a8b 100644 --- a/src/modest-search.c +++ b/src/modest-search.c @@ -612,7 +612,7 @@ modest_search_account_get_folders_cb (TnyFolderStore *self, TnyList *children = tny_simple_list_new (); helper->pending_calls++; tny_folder_store_get_folders_async (TNY_FOLDER_STORE (folder), children, NULL, - FALSE, modest_search_account_get_folders_cb, + modest_search_account_get_folders_cb, NULL, helper); } @@ -654,7 +654,7 @@ _search_account (TnyAccount *account, /* Get folders */ tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account), folders, NULL, - FALSE, modest_search_account_get_folders_cb, + modest_search_account_get_folders_cb, NULL, helper); } diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 5ed3484..f1b221e 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -1650,7 +1650,7 @@ add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, info = g_slice_new0 (AddOutboxInfo); info->account_store = self; info->transport_account = g_object_ref (transport_account); - tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info); g_object_unref (account_outbox); } @@ -2068,7 +2068,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter)); TnyIterator *folders_iter = NULL; - tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL); + tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL); folders_iter = tny_list_create_iterator (folders); while (msg == NULL && !tny_iterator_is_done (folders_iter)) { diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index ab7149e..63e87ec 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -117,7 +117,7 @@ modest_tny_account_get_special_folder (TnyAccount *account, /* There is no need to do this _async, as these are local folders. */ /* TODO: However, this seems to fail sometimes when the network is busy, * returning an empty list. murrayc. */ - tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, FALSE, &error); + tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, &error); if (error) { g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message); g_error_free (error); @@ -903,7 +903,7 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, if (!TNY_IS_MERGE_FOLDER (folder) && (TNY_IS_FOLDER (folder) && tny_folder_get_folder_type (TNY_FOLDER (folder)) != TNY_FOLDER_TYPE_OUTBOX)) - tny_folder_store_get_folders_async (folder, folders, NULL, FALSE, + tny_folder_store_get_folders_async (folder, folders, NULL, recurse_folders_async_cb, NULL, helper); g_object_unref (folders); @@ -953,7 +953,7 @@ modest_tny_folder_store_get_folder_stats (TnyFolderStore *self, folders = tny_simple_list_new (); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (self), - folders, NULL, FALSE, + folders, NULL, recurse_folders_async_cb, NULL, helper); g_object_unref (folders); diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c index 87f6921..57e865a 100644 --- a/src/modest-tny-folder.c +++ b/src/modest-tny-folder.c @@ -418,7 +418,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent, /* Get direct subfolders */ subfolders = tny_simple_list_new (); - tny_folder_store_get_folders (parent, subfolders, NULL, FALSE, &err); + tny_folder_store_get_folders (parent, subfolders, NULL, &err); /* Check names */ iter = tny_list_create_iterator (subfolders); -- 1.7.9.5