Changeset 3787

Timestamp:

10/26/08 11:44:59

Author:

pvanhoof

Message:

2008-10-24 Rob Taylor <rob.taylor@codethink.co.uk>

& Martin Bonnin <martinbonnin@gmail.com>

• Re-submission for the add-a-refresh-parameter-to-tny_folder_store_get_folder():
  

makes the patch atomic by adapting to the new api where needed
also honour the camel folders flags (caused some critical camel warnings else)

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (12 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (10 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.h (modified) (1 diff)
• trunk/libtinymail/tny-combined-account.c (modified) (2 diffs)
• trunk/libtinymail/tny-folder-store.c (modified) (9 diffs)
• trunk/libtinymail/tny-folder-store.h (modified) (2 diffs)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (3 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (2 diffs)
• trunk/tests/functional/account-refresh.c (modified) (2 diffs)
• trunk/tests/functional/folder-lister-async.c (modified) (2 diffs)
• trunk/tests/functional/folder-lister.c (modified) (1 diff)
• trunk/tests/functional/folder-remove.c (modified) (1 diff)
• trunk/tests/functional/folder-transfer.c (modified) (1 diff)
• trunk/tests/functional/msg-transfer.c (modified) (1 diff)
• trunk/tests/memory/memory-test.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-10-24  Rob Taylor  <rob.taylor@codethink.co.uk>
+            & Martin Bonnin  <martinbonnin@gmail.com>
+
+        * Re-submission for the add-a-refresh-parameter-to-tny_folder_store_get_folder():
+        makes the patch atomic by adapting to the new api where needed
+        also honour the camel folders flags (caused some critical camel warnings else)
+
-2008-10-16  Philip Van Hoof  <philip@codeminded.be>
-

trunk/libtinymail-camel/tny-camel-folder.c

@@ -3177 +3177 @@
-                TnyIterator *iter;
-
-
+TRUE, 
-
-                if (nerr != NULL)
@@ -3349 +3349 @@
-
-        list = func (list, cpy_event_new (TNY_FOLDER_STORE (into), folder));
-
+TRUE, 
-        iter = tny_list_create_iterator (folders);
-        while (!tny_iterator_is_done (iter))
@@ -4885 +4885 @@
-                TnyIterator *iter;
-
- 
-
+
+TRUE, 
-
-                if (nerr != NULL)
@@ -5329 +5329 @@
-
-static void
-
-
-
+gboolean refresh, 
+
+refresh, 
-}
-
-static void 
-
+gboolean refresh, 
-{
-        gboolean cant_reuse_iter = TRUE;
@@ -5366 +5366 @@
-                g_return_if_fail (priv->folder_name != NULL);
-
-
+
+
+
+
+
-
-                priv->cant_reuse_iter = FALSE;
@@ -5430 +5434 @@
-}
-
-
-typedef struct 
-{
@@ -5440 +5443 @@
-        TnyGetFoldersCallback callback;
-        TnyFolderStoreQuery *query;
+        gboolean refresh;
-        gpointer user_data;
-        TnySessionCamel *session;
@@ -5490 +5494 @@
-
-        tny_folder_store_get_folders (TNY_FOLDER_STORE (info->self),
-
+info->refresh, 
-
-        info->cancelled = FALSE;
@@ -5537 +5541 @@
-
-static void 
-
-
-
+gboolean refresh, 
+
+refresh, 
-}
-
-
-static void 
-
+gboolean refresh, 
-{
-        GetFoldersInfo *info;
@@ -5558 +5562 @@
-        info->user_data = user_data;
-        info->query = query;
+        info->refresh = refresh;
-        info->err = NULL;
-
@@ -5580 +5585 @@
-}
-
+static void
+tny_camel_folder_store_refresh (TnyFolderStore *self, GError **err)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        CamelFolderInfo *iter;
+        TnyAccount *account = NULL;
+        CamelStore *store = priv->store;
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
+        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
+                        priv->account, err, TNY_ERROR_DOMAIN,
+                        TNY_SERVICE_ERROR_GET_FOLDERS))
+                return;
+
+        account = tny_folder_get_account (TNY_FOLDER (self));
+
+        g_return_if_fail (priv->folder_name != NULL);
+
+        priv->iter = camel_store_get_folder_info (store, priv->folder_name, 0, &ex);
+        priv->cant_reuse_iter = FALSE;
+
+        if (camel_exception_is_set (&ex))
+        {
+                _tny_camel_exception_to_tny_error (&ex, err);
+                camel_exception_clear (&ex);
+                _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
+
+                if (priv->iter == NULL)
+                        return;
+        }
+
+        priv->iter_parented = FALSE;
+
+        iter = priv->iter;
+ 
+        if (iter)
+        {
+          iter = iter->child;
+          while (iter)
+          {
+                /* Also take a look at camel-maildir-store.c:525 */
+                if (!(iter->flags & CAMEL_FOLDER_VIRTUAL) && priv->account)
+                {
+                        gboolean was_new = FALSE;
+                        TnyCamelFolder *folder = (TnyCamelFolder *) tny_camel_store_account_factor_folder (
+                                TNY_CAMEL_STORE_ACCOUNT (priv->account),
+                                iter->full_name, &was_new);
+                        if (was_new) {
+                                TnyFolderStoreChange *change;
+                                _tny_camel_folder_set_folder_info (self, folder, iter);
+                                change = tny_folder_store_change_new (TNY_FOLDER_STORE(self));
+                                tny_folder_store_change_add_created_folder (change, TNY_FOLDER(folder));
+                                notify_folder_store_observers_about_in_idle (self,
+                                        change,
+                                        TNY_FOLDER_PRIV_GET_SESSION (priv));
+                                g_object_unref(change);
+                        }
+                        g_object_unref (folder);
+                }
+                iter = iter->next;
+          }
+        }
+
+
+        _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
+
+        return;
+}
+
+typedef struct
+{
+        TnyCamelQueueable parent;
+
+        GError *err;
+        TnyFolderStore *self;
+        TnyFolderStoreCallback callback;
+        gpointer user_data;
+        TnySessionCamel *session;
+        gboolean cancelled;
+} StoreRefreshInfo;
+
+
+static void
+tny_camel_folder_store_refresh_async_destroyer (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
+        /* thread reference */
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (info->self);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        _tny_session_stop_operation (info->session);
+
+        camel_object_unref (info->session);
+
+        return;
+}
+
+static gboolean
+tny_camel_folder_store_refresh_async_callback (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, info->cancelled, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+
+static gpointer 
+tny_camel_folder_store_refresh_async_thread (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = (StoreRefreshInfo*) thr_user_data;
+
+        tny_camel_folder_store_refresh (TNY_FOLDER_STORE (info->self), &info->err);
+
+        info->cancelled = FALSE;
+        if (info->err != NULL) {
+                if (camel_strstrcase (info->err->message, "cancel") != NULL)
+                        info->cancelled = TRUE;
+        }
+
+        return NULL;
+}
+
+static void
+tny_camel_folder_store_refresh_async_cancelled_destroyer (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
+        /* thread reference */
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (info->self);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        /**/
+
+        camel_object_unref (info->session);
+
+        return;
+}
+
+static gboolean
+tny_camel_folder_store_refresh_async_cancelled_callback (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, TRUE, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+static void
+tny_camel_folder_store_refresh_async (TnyFolderStore *self, TnyFolderStoreCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        StoreRefreshInfo *info;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        /* Idle info for the callbacks */
+        info = g_slice_new (StoreRefreshInfo);
+        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
+        camel_object_ref (info->session);
+        info->self = self;
+        info->callback = callback;
+        info->user_data = user_data;
+        info->err = NULL;
+
+        /* thread reference */
+        _tny_camel_folder_reason (priv);
+        g_object_ref (info->self);
+
+        _tny_camel_queue_launch (TNY_FOLDER_PRIV_GET_QUEUE (priv),
+                tny_camel_folder_store_refresh_async_thread,
+                tny_camel_folder_store_refresh_async_callback,
+                tny_camel_folder_store_refresh_async_destroyer,
+                tny_camel_folder_store_refresh_async_cancelled_callback,
+                tny_camel_folder_store_refresh_async_cancelled_destroyer,
+                &info->cancelled,
+                info, sizeof (StoreRefreshInfo),
+                __FUNCTION__);
+
+        return;
+}
-
-void
@@ -6231 +6430 @@
-        klass->add_observer= tny_camel_folder_store_add_observer;
-        klass->remove_observer= tny_camel_folder_store_remove_observer;
+        klass->refresh_async = tny_camel_folder_store_refresh_async;
-
-        return;

trunk/libtinymail-camel/tny-camel-folder.h

@@ -93 +93 @@
-        void (*remove_msgs_async) (TnyFolder *self, TnyList *headers, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-
-
+gboolean refresh, 
+gboolean refresh, 
-        void (*remove_folder) (TnyFolderStore *self, TnyFolder *folder, GError **err);
-        TnyFolder* (*create_folder) (TnyFolderStore *self, const gchar *name, GError **err);

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -953 +953 @@
-
-                tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
-
+TRUE, 
-
-                if (nerr != NULL)
@@ -1277 +1277 @@
-
-static void
-
-
-
+gboolean refresh, 
+
+refresh, 
-}
-
@@ -1352 +1352 @@
-
-static void 
-
+gboolean refresh, 
-{
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -1402 +1402 @@
-        iter = priv->iter;
-
-
-
+
+
+
+
+
+
+
+
-
-        /*else
@@ -1473 +1479 @@
-        TnyGetFoldersCallback callback;
-        TnyFolderStoreQuery *query;
+        gboolean refresh;
-        gpointer user_data;
-        TnySessionCamel *session;
@@ -1519 +1526 @@
-
-        tny_folder_store_get_folders (TNY_FOLDER_STORE (info->self),
-
+info->refresh, 
-
-        info->cancelled = FALSE;
@@ -1560 +1567 @@
-
-static void
-
-
-
+gboolean refresh, 
+
+refresh, 
-}
-
-static void 
-
+gboolean refresh, 
-{
-        GetFoldersInfo *info;
@@ -1585 +1592 @@
-        info->user_data = user_data;
-        info->query = query;
+        info->refresh = refresh;
-
-        /* thread reference */
@@ -1600 +1608 @@
-                &info->cancelled, info, sizeof (GetFoldersInfo),
-                TNY_CAMEL_QUEUE_NORMAL_ITEM|TNY_CAMEL_QUEUE_PRIORITY_ITEM, 
+                __FUNCTION__);
+
+        return;
+}
+
+static void
+tny_camel_store_account_store_refresh (TnyFolderStore *self, GError **err)
+{
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        TnyCamelStoreAccountPriv *priv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (self);
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+        CamelFolderInfo *iter=NULL; guint32 flags; CamelStore *store;
+
+        g_assert (CAMEL_IS_SESSION (apriv->session));
+
+        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err, 
+                        TNY_ERROR_DOMAIN, TNY_SERVICE_ERROR_GET_FOLDERS))
+                return;
+
+        if (apriv->service == NULL || !CAMEL_IS_SERVICE (apriv->service))
+        {
+                g_set_error (err, TNY_ERROR_DOMAIN,
+                                TNY_SERVICE_ERROR_GET_FOLDERS,
+                                _("Account not ready for this operation. "
+                                "This problem indicates a bug in the software."));
+                _tny_session_stop_operation (apriv->session);
+                return;
+        }
+
+        store = CAMEL_STORE (apriv->service);
+
+        if (camel_exception_is_set (&ex))
+        {
+                _tny_camel_exception_to_tny_error (&ex, err);
+                camel_exception_clear (&ex);
+                _tny_session_stop_operation (apriv->session);
+                return;
+        }
+
+        g_assert (CAMEL_IS_STORE (store));
+
+        flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL |
+                CAMEL_STORE_FOLDER_INFO_RECURSIVE;
+
+        if (!camel_session_is_online ((CamelSession*) apriv->session))
+                flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
+
+
+        priv->iter = camel_store_get_folder_info (store, "", flags, &ex);
+
+        if (camel_exception_is_set (&ex))
+        {
+                _tny_camel_exception_to_tny_error (&ex, err);
+                camel_exception_clear (&ex);
+
+                _tny_session_stop_operation (apriv->session);
+
+                return;
+        }
+
+        priv->cant_reuse_iter = FALSE;
+
+        camel_object_ref (CAMEL_OBJECT (store));
+        priv->iter_store = store;
+
+        iter = priv->iter;
+
+        if (iter)
+        {
+          iter = iter->child;
+          while (iter)
+          {
+                /* Also take a look at camel-maildir-store.c:525 */
+                if (!(iter->flags & CAMEL_FOLDER_VIRTUAL))
+                {
+                        gboolean was_new = FALSE;
+                        TnyCamelFolder *folder = (TnyCamelFolder *) tny_camel_store_account_factor_folder (
+                                TNY_CAMEL_STORE_ACCOUNT (self),
+                                iter->full_name, &was_new);
+                        if (was_new) {
+                                TnyFolderStoreChange *change;
+                                _tny_camel_folder_set_folder_info (self, folder, iter);
+                                change = tny_folder_store_change_new (TNY_FOLDER_STORE(self));
+                                tny_folder_store_change_add_created_folder (change, TNY_FOLDER(folder));
+                                notify_folder_store_observers_about_in_idle (self,
+                                        change);
+                                g_object_unref(change);
+                        }
+                        g_object_unref (folder);
+                }
+                iter = iter->next;
+          }
+        }
+
+
+        _tny_session_stop_operation (apriv->session);
+
+        return;
+}
+
+
+typedef struct
+{
+        TnyCamelQueueable parent;
+
+        GError *err;
+        TnyFolderStore *self;
+        TnyFolderStoreCallback callback;
+        gpointer user_data;
+        TnySessionCamel *session;
+        gboolean cancelled;
+
+} StoreRefreshInfo;
+
+
+static void
+tny_camel_store_account_store_refresh_async_destroyer (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+
+        /* gidle reference */
+        g_object_unref (info->self);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        camel_object_unref (info->session);
+
+        return;
+}
+
+static gboolean
+tny_camel_store_account_store_refresh_async_callback (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, info->cancelled, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+
+static gpointer
+tny_camel_store_account_store_refresh_async_thread (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = (StoreRefreshInfo*) thr_user_data;
+
+        tny_camel_store_account_store_refresh (TNY_FOLDER_STORE (info->self), &info->err);
+
+        info->cancelled = FALSE;
+        if (info->err != NULL) {
+                if (camel_strstrcase (info->err->message, "cancel") != NULL)
+                        info->cancelled = TRUE;
+        }
+
+        return NULL;
+}
+
+static void
+tny_camel_store_account_store_refresh_async_cancelled_destroyer (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        /* gidle references */
+        g_object_unref (info->self);
+        if (info->err)
+                g_error_free (info->err);
+
+        camel_object_unref (info->session);
+
+        return;
+}
+
+static gboolean
+tny_camel_store_account_store_refresh_async_cancelled_callback (gpointer thr_user_data)
+{
+        StoreRefreshInfo *info = thr_user_data;
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, TRUE, info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+        return FALSE;
+}
+
+static void
+tny_camel_store_account_store_refresh_async (TnyFolderStore *self, TnyFolderStoreCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        StoreRefreshInfo *info;
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        TnyCamelStoreAccountPriv *priv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (self);
+
+        /* Idle info for the callbacks */
+        info = g_slice_new0 (StoreRefreshInfo);
+        info->session = apriv->session;
+        camel_object_ref (info->session);
+
+        info->err = NULL;
+        info->self = self;
+        info->callback = callback;
+        info->user_data = user_data;
+
+        /* thread reference */
+        g_object_ref (info->self);
+
+        _tny_camel_queue_launch_wflags (priv->queue,
+                tny_camel_store_account_store_refresh_async_thread,
+                tny_camel_store_account_store_refresh_async_callback,
+                tny_camel_store_account_store_refresh_async_destroyer,
+                tny_camel_store_account_store_refresh_async_cancelled_callback,
+                tny_camel_store_account_store_refresh_async_cancelled_destroyer,
+                &info->cancelled, info, sizeof (StoreRefreshInfo),
+                TNY_CAMEL_QUEUE_NORMAL_ITEM|TNY_CAMEL_QUEUE_PRIORITY_ITEM,
-                __FUNCTION__);
-
@@ -2073 +2295 @@
-        klass->add_observer= tny_camel_store_account_add_observer;
-        klass->remove_observer= tny_camel_store_account_remove_observer;
+        klass->refresh_async = tny_camel_store_account_store_refresh_async;
-
-        return;

trunk/libtinymail-camel/tny-camel-store-account.h

@@ -50 +50 @@
-
-        /* virtual methods */
-
-
+gboolean refresh, 
+gboolean refresh, 
-        void (*remove_folder) (TnyFolderStore *self, TnyFolder *folder, GError **err);
-        TnyFolder* (*create_folder) (TnyFolderStore *self, const gchar *name, GError **err);

trunk/libtinymail/tny-combined-account.c

@@ -300 +300 @@
-
-static void
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -541 +549 @@
-        klass->add_observer= tny_combined_account_add_observer;
-        klass->remove_observer= tny_combined_account_remove_observer;
+        klass->refresh_async = tny_combined_account_refresh_async;
-}
-

trunk/libtinymail/tny-folder-store.c

@@ -267 +267 @@
- * @list: a #TnyList to to which the folders will be prepended
- * @query: (null-ok): a #TnyFolderStoreQuery or NULL
+ * @refresh: synchronize with the service first
- * @err: (null-ok): a #GError or NULL
- *
@@ -278 +279 @@
- * TnyIterator *iter; TnyFolderStoreQuery *query = ...
- * TnyList *folders = tny_simple_list_new ();
-
+TRUE, 
- * iter = tny_list_create_iterator (folders);
- * while (!tny_iterator_is_done (iter))
@@ -296 +297 @@
- **/
-void 
-
+gboolean refresh, 
-{
-#ifdef DBC /* require */
@@ -307 +308 @@
-#endif
-
-
+refresh, 
-
-#ifdef DBC /* ensure */
@@ -344 +345 @@
- * @list: a #TnyList to to which the folders will be prepended
- * @query: (null-ok): A #TnyFolderStoreQuery object
+ * @refresh: synchronize with the service first
- * @callback: (null-ok): a #TnyGetFoldersCallback or NULL
- * @status_callback: (null-ok): a #TnyStatusCallback or NULL
@@ -364 +366 @@
- *         g_print ("%s\n", tny_folder_get_name (TNY_FOLDER (folder)));
- *         tny_folder_store_get_folders_async (folder,
-
+true, 
- *         g_object_unref (folder);
- *         tny_iterator_next (iter);
@@ -376 +378 @@
- *     folders = tny_simple_list_new ();
- *     tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account),
-
+TRUE, 
- *     g_object_unref (folders);
- * }
@@ -389 +391 @@
- **/
-void 
-
+gboolean refresh, 
-{
-#ifdef DBC /* require */
@@ -400 +402 @@
-#endif
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void

trunk/libtinymail/tny-folder-store.h

@@ -49 +49 @@
-        TnyFolder* (*create_folder) (TnyFolderStore *self, const gchar *name, GError **err);
-        void (*create_folder_async) (TnyFolderStore *self, const gchar *name, TnyCreateFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-
+gboolean refresh, 
+gboolean refresh, 
-        void (*add_observer) (TnyFolderStore *self, TnyFolderStoreObserver *observer);
-        void (*remove_observer) (TnyFolderStore *self, TnyFolderStoreObserver *observer);
+        void (*refresh_async) (TnyFolderStore *self, TnyFolderStoreCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-};
@@ -60 +61 @@
-void tny_folder_store_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err);
-void tny_folder_store_create_folder_async (TnyFolderStore *self, const gchar *name, TnyCreateFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
+gboolean refresh, 
-void tny_folder_store_add_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer);
-void tny_folder_store_remove_observer (TnyFolderStore *self, TnyFolderStoreObserver *observer);
+void tny_folder_store_refresh_async (TnyFolderStore *self, TnyFolderStoreCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-#ifndef TNY_DISABLE_DEPRECATED
-
+gboolean refresh, 
-TnyFolder *tny_folder_store_create_folder (TnyFolderStore *self, const gchar *name, GError **err);
-#endif

trunk/libtinymail/tny-shared.h

@@ -138 +138 @@
-typedef TnyStream* (*TnyStreamCacheOpenStreamFetcher) (TnyStreamCache *self, gint64 *expected_size, gpointer userdata);
-typedef gboolean (*TnyStreamCacheRemoveFilter) (TnyStreamCache *self, const gchar *id, gpointer userdata);
+typedef void (*TnyFolderStoreCallback) (TnyFolderStore *self, gboolean cancelled, GError *err, gpointer user_data);
-
-/** 

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -116 +116 @@
-
-        /* TODO add error checking and reporting here */
-
+TRUE, 
-        iter = tny_list_create_iterator (folders);
-
@@ -344 +344 @@
-        list = tny_simple_list_new ();
-        tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account), 
-
+TRUE, 
-
-        return;
@@ -523 +523 @@
-
-        tny_folder_store_get_folders_async (TNY_FOLDER_STORE (folder_store), 
-
+TRUE,  
-
-        /* recurse_folders_sync (self, TNY_FOLDER_STORE (folder_store), &name_iter);  */

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -400 +400 @@
-        TnyIterator *f_iter;
-
-
+TRUE, 
-        f_iter = tny_list_create_iterator (folders);
-        while (!tny_iterator_is_done (f_iter))
@@ -1179 +1179 @@
-                        g_free (folder_name);
-                        list = tny_simple_list_new ();
-
+TRUE, 
-              &n