* Migrated to the new tinymail API

[modest] / src / modest-tny-account.c

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index ac6810d..ab7149e 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -48,8 +48,8 @@
 #include <tny-merge-folder.h>
 #include <modest-debug.h>
 #include <string.h>
-#ifdef MODEST_PLATFORM_MAEMO
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#ifndef MODEST_TOOLKIT_GTK
+#if MODEST_HILDON_API == 0
 #include <hildon-widgets/hildon-file-system-info.h>
 #else
 #include <hildon/hildon-file-system-info.h>
@@ -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, &error);
+       tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, FALSE, &error);
        if (error) {
                g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message);
                g_error_free (error);
@@ -591,7 +591,7 @@ typedef struct
 
 
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 /* Gets the memory card name: */
 static void 
 on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
@@ -632,7 +632,7 @@ on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
 
 void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
 {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
        /* Just use the hard-coded path for the single memory card,
         * rather than try to figure out the path to the specific card by 
         * looking at the maildir URI:
@@ -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,
+                       tny_folder_store_get_folders_async (folder, folders, NULL, FALSE,
                                                            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,
+                                           folders, NULL, FALSE,
                                            recurse_folders_async_cb, 
                                            NULL, helper);
        g_object_unref (folders);