Changeset 3779

Timestamp:

10/16/08 21:27:12

Author:

pvanhoof

Message:

2008-10-16 Philip Van Hoof <philip@codeminded.be>

• Reverted svn diff -r 3774:3775, the behaviour of the folders was
  

incorrect. This was a commit that combined multiple of Rob's patches
together. The entire commit was probably not entirely wrong, but the
behaviour must be fixed before re-approval can take place.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-account.h (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-folder-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (20 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-queue-priv.h (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-queue.c (modified) (10 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (21 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-change.c (modified) (5 diffs)
• trunk/libtinymail/tny-folder-store-change.h (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-16  Philip Van Hoof  <philip@codeminded.be>
+
+        * Reverted `svn diff -r 3774:3775`, the behaviour of the folders was
+        incorrect. This was a commit that combined multiple of Rob's patches
+        together. The entire commit was probably not entirely wrong, but the
+        behaviour must be fixed before re-approval can take place.
+
-2008-10-16  Sergio Villar Senin  <svillar@igalia.com>
-

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

@@ -1872 +1872 @@
-}
-
-
-/**
- * tny_camel_account_stop:
- * @self: a #TnyCamelAccount object
- * @callback: a callback when the account has stopped all operations
- * @user_data: user data for the callback
- *
- * Request a stop of all operations on an account
- * @callback will be called with @user_data when all operations have stopped.
- * The account will be unusable after calling this function.
- **/
-void
-tny_camel_account_stop (TnyCamelAccount *self, TnyCamelAccountStopCallback callback, gpointer user_data)
-{
-        TNY_CAMEL_ACCOUNT_GET_CLASS (self)->stop(self, callback, user_data);
-}
-
-void
-tny_camel_account_stop_default (TnyCamelAccount *self, TnyCamelAccountStopCallback callback, gpointer user_data)
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        _tny_camel_queue_stop (priv->queue, callback, user_data);
-}
-
-static gboolean
-tny_camel_account_is_ready (TnyAccount *self)
@@ -2223 +2199 @@
-        g_static_rec_mutex_unlock (priv->service_lock);
-
-        _tny_camel_queue_stop (priv->queue, NULL, NULL);
-        g_object_unref (priv->queue);
-        g_object_unref (priv->con_strat);
@@ -2344 +2319 @@
-
-        class->set_online= tny_camel_account_set_online_default;
-        class->stop = tny_camel_account_stop_default;
-
-        object_class->finalize = tny_camel_account_finalize;

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

@@ -33 +33 @@
-#define TNY_CAMEL_ACCOUNT_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_CAMEL_ACCOUNT, TnyCamelAccountClass))
-#define TNY_IS_CAMEL_ACCOUNT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_CAMEL_ACCOUNT))
-CAMEL_A
+ACAMEL_
-#define TNY_CAMEL_ACCOUNT_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_CAMEL_ACCOUNT, TnyCamelAccountClass))
-
@@ -51 +51 @@
-typedef void (*TnyCamelSetOnlineCallback) (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data);
-
-typedef void (*TnyCamelAccountStopCallback) (gpointer user_data);
-
-struct _TnyCamelAccount
@@ -96 +95 @@
-
-        void (*set_online) (TnyCamelAccount *self, gboolean online, TnyCamelSetOnlineCallback callback, gpointer user_data);
-        void (*stop) (TnyCamelAccount *self, TnyCamelAccountStopCallback callback, gpointer user_data);
-
-        /* Abstract methods */
@@ -118 +116 @@
-void tny_camel_account_get_supported_secure_authentication(TnyCamelAccount *self, TnyCamelGetSupportedSecureAuthCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-void tny_camel_account_stop (TnyCamelAccount *self, TnyCamelAccountStopCallback callback, gpointer user_data);
-G_END_DECLS
-

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

@@ -55 +55 @@
-        GList *obs, *sobs;
-        gboolean cant_reuse_iter;
-        GHashTable *known_folders;
-};
-

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

@@ -1533 +1533 @@
-}
-#endif
-
-static void
-known_folder_del (gpointer user_data, GObject *folder)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (user_data);
-        g_hash_table_remove (priv->known_folders, folder);
-}
-
-
-static gboolean
-known_folder_remover (GObject *folder,
-                      gpointer value,
-                      TnyCamelFolder *self)
-{
-        g_object_weak_unref (folder, known_folder_del, self);
-        return TRUE;
-}
-
-void
@@ -3194 +3177 @@
-                TnyIterator *iter;
-
-TRUE, 
+
-
-                if (nerr != NULL)
@@ -3366 +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))
@@ -4902 +4885 @@
-                TnyIterator *iter;
-
-
-TRUE, 
+ 
+
-
-                if (nerr != NULL)
@@ -5050 +5033 @@
-
-        _tny_camel_folder_set_name (folder, info->name);
+        _tny_camel_folder_set_iter (folder, info);
-
-        if (TNY_IS_CAMEL_FOLDER (self)) {
@@ -5058 +5042 @@
-        }
-
-        _tny_camel_folder_set_iter (folder, info);
-        _tny_camel_folder_set_parent (folder, self);
-}
@@ -5327 +5310 @@
-}
-
-
-self
-
-self
+ 
+folder
+
+folder
-
-        priv->cant_reuse_iter = FALSE;
@@ -5342 +5325 @@
-        priv->iter_parented = TRUE;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (iter)
-        {
@@ -5349 +5391 @@
-          {
-                /* Also take a look at camel-maildir-store.c:525 */
-
+ && _tny_folder_store_query_passes (query, iter) && priv->account
-                {
-                        gboolean was_new = FALSE;
-                        TnyCamelFolder *folder = (TnyCamelFolder *) tny_camel_store_account_factor_folder (
-
+ 
-                                iter->full_name, &was_new);
-
-                        if (was_new)
-
-
-
-
-
-
+
+
-                        g_object_unref (folder);
-                }
-                iter = iter->next;
-          }
-        }
-        return;
-}
-
-static void
-tny_camel_folder_get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, gboolean refresh, GError **err)
-{
-        TNY_CAMEL_FOLDER_GET_CLASS (self)->get_folders(self, list, query, refresh, err);
-}
-
-static void 
-tny_camel_folder_get_folders_default (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, gboolean refresh, GError **err)
-{
-        gboolean cant_reuse_iter = TRUE;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        CamelFolderInfo *iter;
-        TnyAccount *account = NULL;
-        gboolean first_time = FALSE;
-
-        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));
-
-        if (account) {
-                TnyCamelStoreAccountPriv *aspriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (account);
-                if (aspriv)
-                        cant_reuse_iter = aspriv->cant_reuse_iter;
-                g_object_unref (account);
-        }
-
-        if (!cant_reuse_iter)
-                cant_reuse_iter = cant_reuse_iter;
-
-        if ((!priv->iter && priv->iter_parented) || cant_reuse_iter)
-        {
-                CamelStore *store = priv->store;
-                CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
-                g_return_if_fail (priv->folder_name != NULL);
-
-                if (!refresh && CAMEL_IS_DISCO_STORE(store)) {
-                        iter = CAMEL_DISCO_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->get_folder_info_offline(store,  priv->folder_name, 0, &ex);
-                } else {
-                        iter = camel_store_get_folder_info (store, priv->folder_name, 0, &ex);
-                }
-
-                if (iter && priv->iter == NULL)  {
-                        first_time = TRUE;
-                }
-                priv->iter = iter;
-                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 && priv->account)
-        {
-          TnyFolderStoreChange *change = NULL;
-
-          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 (priv->account),
-                                iter->full_name, &was_new);
-
-                        if (was_new)
-                                _tny_camel_folder_set_folder_info (self, folder, iter);
-
-                        if (folder && !g_hash_table_lookup_extended (priv->known_folders, folder, NULL, NULL)) {
-                                g_hash_table_insert(priv->known_folders, folder, NULL);
-                                g_object_weak_ref (G_OBJECT(folder), known_folder_del, self);
-
-                                if (!change)
-                                        change = tny_folder_store_change_new (TNY_FOLDER_STORE(self));
-
-
-                                if (first_time) {
-                                        tny_folder_store_change_add_appeared_folder (change, TNY_FOLDER(folder));
-                                } else {
-                                        tny_folder_store_change_add_created_folder (change, TNY_FOLDER(folder));
-                                }
-
-                        }
-
-                        if (_tny_folder_store_query_passes (query, iter)) {
-                                tny_list_prepend (list, G_OBJECT (folder));
-                        }
-                        g_object_unref (folder);
-                }
-                iter = iter->next;
-          }
-          if (change) {
-                notify_folder_store_observers_about_in_idle (self, change,
-                        TNY_FOLDER_PRIV_GET_SESSION (priv));
-                g_object_unref(change);
-          }
-        }
@@ -5509 +5430 @@
-}
-
+
-typedef struct 
-{
@@ -5518 +5440 @@
-        TnyGetFoldersCallback callback;
-        TnyFolderStoreQuery *query;
-        gboolean refresh;
-        gpointer user_data;
-        TnySessionCamel *session;
@@ -5569 +5490 @@
-
-        tny_folder_store_get_folders (TNY_FOLDER_STORE (info->self),
-info->refresh, 
+
-
-        info->cancelled = FALSE;
@@ -5616 +5537 @@
-
-static void 
-gboolean refresh, 
-
-refresh, 
+
+
+
-}
-
-
-static void 
-gboolean refresh, 
+
-{
-        GetFoldersInfo *info;
@@ -5637 +5558 @@
-        info->user_data = user_data;
-        info->query = query;
-        info->refresh = refresh;
-        info->err = NULL;
-
@@ -5660 +5580 @@
-}
-
-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;
-        gboolean first_time = FALSE;
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-                        priv->account, err, TNY_ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_FOLDERS))
-                return;
-
-        g_return_if_fail (priv->folder_name != NULL);
-
-        iter = camel_store_get_folder_info (store, priv->folder_name, 0, &ex);
-
-        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->cant_reuse_iter = FALSE;
-        priv->iter_parented = FALSE;
-
-        if (iter && priv->iter == NULL)  {
-                first_time = TRUE;
-        }
-
-        priv->iter = iter;
-
-        if (iter && priv->account)
-        {
-          TnyFolderStoreChange *change = NULL;
-          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 (priv->account),
-                                iter->full_name, &was_new);
-                        if (was_new)
-                                _tny_camel_folder_set_folder_info (self, folder, iter);
-
-                        if (was_new)
-                                _tny_camel_folder_set_folder_info (self, folder, iter);
-
-                        if (folder && !g_hash_table_lookup_extended (priv->known_folders, folder, NULL, NULL)) {
-                                g_hash_table_insert(priv->known_folders, folder, NULL);
-                                g_object_weak_ref (G_OBJECT(folder), known_folder_del, self);
-
-                                if (!change)
-                                        change = tny_folder_store_change_new (TNY_FOLDER_STORE(self));
-
-
-                                if (first_time) {
-                                        tny_folder_store_change_add_appeared_folder (change, TNY_FOLDER(folder));
-                                } else {
-                                        tny_folder_store_change_add_created_folder (change, TNY_FOLDER(folder));
-                                }
-
-                        }
-                        g_object_unref (folder);
-                }
-                iter = iter->next;
-          }
-          if (change) {
-                notify_folder_store_observers_about_in_idle (self, change,
-                        TNY_FOLDER_PRIV_GET_SESSION (priv));
-                g_object_unref(change);
-          }
-
-        }
-
-
-        _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
@@ -6191 +5896 @@
-}
-
-static void build_appeared_change (gpointer key,
-                                   gpointer value,
-                                   gpointer user_data)
-{
-        TnyFolder *folder = key;
-        TnyFolderStoreChange *change = user_data;
-        tny_folder_store_change_add_appeared_folder (change, folder);
-}
-
-static void
-tny_camel_folder_store_add_observer_default (TnyFolderStore *self, TnyFolderStoreObserver *observer)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyFolderStoreChange *change = tny_folder_store_change_new (self);
-
-        g_assert (TNY_IS_FOLDER_STORE_OBSERVER (observer));
@@ -6214 +5909 @@
-        }
-        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        g_hash_table_foreach (priv->known_folders, build_appeared_change, change);
-        if (tny_folder_store_change_get_changed (change) != 0) 
-                notify_folder_store_observers_about_in_idle (self, change, TNY_FOLDER_PRIV_GET_SESSION (priv));
-        g_object_unref (change);
-
-        return;
@@ -6368 +6058 @@
-        TnyCamelFolder *self = (TnyCamelFolder*) object;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-        g_hash_table_foreach_remove (priv->known_folders, (GHRFunc) known_folder_remover, self);
-        g_hash_table_unref(priv->known_folders);
-
-        if (priv->store)
@@ -6544 +6231 @@
-        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;
@@ -6663 +6349 @@
-        priv->cached_name = NULL;
-        priv->cached_folder_type = TNY_FOLDER_TYPE_UNKNOWN;
-        priv->known_folders = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
-        priv->remove_strat = tny_camel_msg_remove_strategy_new ();
-        priv->receive_strat = tny_camel_full_msg_receive_strategy_new ();

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-queue-priv.h

@@ -38 +38 @@
-typedef struct _TnyCamelQueueable TnyCamelQueueable;
-typedef struct _TnyCamelQueueClass TnyCamelQueueClass;
-typedef void (*TnyCamelQueueStopCb)(gpointer);
-
-struct _TnyCamelQueue
@@ -51 +50 @@
-        gboolean is_waiting;
-        GStaticRecMutex *lock;
-
-
-
-
+
-        gpointer current;
-        TnyCamelQueueStopCb stop_callback;
-        gpointer stop_user_data;
-};
-
@@ -92 +86 @@
-void _tny_camel_queue_cancel_remove_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
-gboolean _tny_camel_queue_has_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
-void _tny_camel_queue_stop (TnyCamelQueue *queue, TnyCamelQueueStopCb stop_cb, gpointer user_data);
-
-G_END_DECLS

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

@@ -47 +47 @@
-        TnyCamelQueue *self = (TnyCamelQueue*) object;
-
-
+ped
-
-        g_mutex_lock (self->mutex);
@@ -76 +76 @@
-        g_mutex_lock (queue->mutex);
-        queue->account = NULL;
-
+ped
-        if (queue->is_waiting) {
-                g_cond_broadcast (queue->condition);
@@ -101 +101 @@
-        return TNY_CAMEL_QUEUE (self);
-}
-
-typedef struct _StopCallbackData StopCallbackData;
-struct _StopCallbackData
-{
-        TnyCamelQueueStopCb cb;
-        gpointer data;
-};
-
-static gboolean
-call_stop_callback (gpointer user_data)
-{
-        StopCallbackData *data = user_data;
-        data->cb(data->data);
-        g_slice_free (StopCallbackData, data);
-        return FALSE;
-}
-
-static void
-idle_add_stop_callback (TnyCamelQueueStopCb cb, gpointer data)
-{
-        StopCallbackData *scd = g_slice_new (StopCallbackData);
-        scd->cb = cb;
-        scd->data = data;
-        g_idle_add (call_stop_callback, scd);
-}
-
-
-typedef struct
@@ -211 +185 @@
-        TnyCamelQueue *queue = user_data;
-
- || queue->list
+ped
-        {
-                GList *first = NULL;
@@ -297 +271 @@
-                        g_slice_free (QueueItem, item);
-
-
-
+
-                        g_mutex_lock (queue->mutex);
-                        queue->is_waiting = TRUE;
@@ -304 +277 @@
-                        queue->is_waiting = FALSE;
-                        g_mutex_unlock (queue->mutex);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        g_object_unref (queue);
-
+
+
-}
-
@@ -430 +397 @@
-_tny_camel_queue_launch_wflags (TnyCamelQueue *queue, GThreadFunc func, GSourceFunc callback, GDestroyNotify destroyer, GSourceFunc cancel_callback, GDestroyNotify cancel_destroyer, gboolean *cancel_field, gpointer data, gsize data_size, TnyCamelQueueItemFlags flags, const gchar *name)
-{
-
-
-
-
-
-
-
-
-
-
+
-
-        if (!g_thread_supported ())
@@ -480 +438 @@
-                queue->list = g_list_append (queue->list, item);
-
-!queue->running
+queue->stopped
-        {
-                GError *err = NULL;
-
+ped
-                g_object_ref (queue);
-
-                queue->running = TRUE;
-
-                queue->thread = g_thread_create (tny_camel_queue_thread_main_func, 
-TRU
+FALS
-                if (err) {
-g_object_unref (queue)
+queue->stopped = TRUE
-                }