Changeset 2593

Timestamp:

08/08/07 16:37:35

Author:

pvanhoof

Message:

2007-08-08 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Code cleanups in TnyCamelSendQueue
        
      • Introduction of tny_folder_add_msg_async
        
      • Better handling of offline (because service is unavailable) cases
        

• • • • This was a major API change
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (11 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (7 diffs)
• trunk/libtinymail/tny-folder.c (modified) (3 diffs)
• trunk/libtinymail/tny-folder.h (modified) (4 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (4 diffs)
• trunk/libtinymail/tny-shared.h (modified) (3 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (2 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Code cleanups in TnyCamelSendQueue
+        * Introduction of tny_folder_add_msg_async
+        * Better handling of offline (because service is unavailable) cases
+
+        * This was a major API change
-
-2007-08-07  Philip Van Hoof  <pvanhoof@gnome.org>

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

@@ -127 +127 @@
-        g_slice_free (ReconInfo, info);
-        return NULL;
+}
+
+static gboolean 
+cancelled_refresh (gpointer user_data)
+{
+        return FALSE;
+}
+
+static void 
+cancelled_refresh_destroy (gpointer user_data)
+{
+        ReconInfo *info = (ReconInfo *) user_data;
+        g_object_unref (info->self);
+        g_slice_free (ReconInfo, info);
+        return;
-}
-
@@ -217 +232 @@
-
-                        _tny_camel_queue_launch_wflags (aspriv->queue, 
-
+
+
-                                TNY_CAMEL_QUEUE_RECONNECT_ITEM,
-                                __FUNCTION__);

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

@@ -86 +86 @@
-
-
+
+
+/* When using a #GMainLoop this method will execute a callback using
+ * g_idle_add_full.  Note that without a #GMainLoop, the callbacks
+ * could happen in a worker thread (depends on who call it) at an
+ * unknown moment in time (check your locking in this case). */
+
+static void
+execute_callback (gint depth, 
+                  gint priority,
+                  GSourceFunc idle_func,
+                  gpointer data, 
+                  GDestroyNotify destroy_func)
+{
+        if (depth > 0){
+                g_idle_add_full (priority, idle_func, data, destroy_func);
+        } else {
+                idle_func (data);
+                destroy_func (data);
+        }
+}
+
+
-typedef struct { 
-        GObject *self;
@@ -627 +650 @@
-        g_static_rec_mutex_unlock (priv->folder_lock);
-}
+
+
+
+typedef struct 
+{
+        TnyFolder *self;
+        TnyFolderCallback callback;
+        TnyStatusCallback status_callback;
+        gpointer user_data;
+        TnyMsg *adding_msg;
+        gboolean cancelled;
+        TnyIdleStopper* stopper;
+        guint depth;
+        GError *err;
+        TnySessionCamel *session;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
+} AddMsgFolderInfo;
+
+
+static void
+tny_camel_folder_add_msg_async_destroyer (gpointer thr_user_data)
+{
+        AddMsgFolderInfo *info = thr_user_data;
+        TnyFolder *self = info->self;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        if (info->adding_msg)
+                g_object_unref (info->adding_msg);
+
+        /* thread reference */
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (self);
+
+        if (info->err)
+                g_error_free (info->err);
+
+        _tny_session_stop_operation (info->session);
+
+        tny_idle_stopper_destroy (info->stopper);
+        info->stopper = NULL;
+
+        if (info->condition) {
+                g_mutex_lock (info->mutex);
+                g_cond_broadcast (info->condition);
+                info->had_callback = TRUE;
+                g_mutex_unlock (info->mutex);
+        }
+
+        return;
+}
+
+static gboolean
+tny_camel_folder_add_msg_async_callback (gpointer thr_user_data)
+{
+        AddMsgFolderInfo *info = thr_user_data;
+        TnyFolder *self = info->self;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyFolderChange *change = tny_folder_change_new (self);
+
+        tny_folder_change_set_new_all_count (change, priv->cached_length);
+        tny_folder_change_set_new_unread_count (change, priv->unread_length);
+        notify_folder_observers_about (self, change);
+        g_object_unref (change);
+
+        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);
+        }
+
+        tny_idle_stopper_stop (info->stopper);
+
+        return FALSE;
+}
+
+
+static void
+tny_camel_folder_add_msg_async_status (struct _CamelOperation *op, const char *what, int sofar, int oftotal, void *thr_user_data)
+{
+        AddMsgFolderInfo *oinfo = thr_user_data;
+        TnyProgressInfo *info = NULL;
+
+        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
+                TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_XFER_MSGS, what, sofar, 
+                oftotal, oinfo->stopper, oinfo->session->priv->ui_lock, oinfo->user_data);
+
+        execute_callback (oinfo->depth, G_PRIORITY_HIGH,
+                tny_progress_info_idle_func, info,
+                tny_progress_info_destroy);
+
+        return;
+}
+
+
+static gpointer 
+tny_camel_folder_add_msg_async_thread (gpointer thr_user_data)
+{
+        AddMsgFolderInfo *info = thr_user_data;
+        TnyFolder *self = info->self;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
+        g_static_rec_mutex_lock (priv->folder_lock);
+
+        _tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (priv->account), 
+                tny_camel_folder_add_msg_async_status, info, 
+                "Adding message");
+
+        tny_folder_add_msg (info->self, info->adding_msg, &info->err);
+
+        info->cancelled = FALSE;
+        if (info->err != NULL) {
+                if (strcasestr (info->err->message, "cancel") != NULL)
+                        info->cancelled = TRUE;
+        }
+
+        priv->cached_length = camel_folder_get_message_count (priv->folder);
+        priv->unread_length = (guint)camel_folder_get_unread_message_count (priv->folder);
+        update_iter_counts (priv);
+
+        _tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account));
+
+        g_static_rec_mutex_unlock (priv->folder_lock);
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        execute_callback (info->depth, G_PRIORITY_DEFAULT, 
+                tny_camel_folder_add_msg_async_callback, info, 
+                tny_camel_folder_add_msg_async_destroyer);
+
+
+        /* Wait on the queue for the mainloop callback to be finished */
+        g_mutex_lock (info->mutex);
+        if (!info->had_callback)
+                g_cond_wait (info->condition, info->mutex);
+        g_mutex_unlock (info->mutex);
+
+        g_mutex_free (info->mutex);
+        g_cond_free (info->condition);
+
+        g_slice_free (AddMsgFolderInfo, thr_user_data);
+
+        return NULL;
+}
+
+static void
+tny_camel_folder_add_msg_async_cancelled_destroyer (gpointer thr_user_data)
+{
+        AddMsgFolderInfo *info = thr_user_data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
+        if (info->adding_msg)
+                g_object_unref (info->adding_msg);
+
+        /* thread reference */
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (info->self);
+
+        if (info->err)
+                g_error_free (info->err);
+        g_slice_free (AddMsgFolderInfo, thr_user_data);
+        return;
+}
+
+static gboolean
+tny_camel_folder_add_msg_async_cancelled_callback (gpointer thr_user_data)
+{
+        AddMsgFolderInfo *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_add_msg_async (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->add_msg_async_func (self, msg, callback, status_callback, user_data);
+        return;
+}
+
+static void 
+tny_camel_folder_add_msg_async_default (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+
+        AddMsgFolderInfo *info;
+        GError *err = NULL;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        /* Idle info for the callbacks */
+        info = g_slice_new (AddMsgFolderInfo);
+        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
+        info->self = self;
+        info->callback = callback;
+        info->status_callback = status_callback;
+        info->user_data = user_data;
+        info->depth = g_main_depth ();
+        info->condition = NULL;
+        info->adding_msg = msg;
+        info->err = NULL;
+
+        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), priv->account, &err, 
+                                TNY_FOLDER_ERROR, TNY_FOLDER_ERROR_ADD_MSG))
+        {
+                if (callback) {
+                        info->err = g_error_copy (err);
+                        g_object_ref (info->self);
+                        g_object_ref (info->adding_msg);
+                        _tny_camel_folder_reason (priv);
+                        execute_callback (info->depth, G_PRIORITY_DEFAULT,
+                                tny_camel_folder_add_msg_async_cancelled_callback, info, 
+                                tny_camel_folder_add_msg_async_cancelled_destroyer);
+                }
+                g_error_free (err);
+                return;
+        }
+
+        info->stopper = tny_idle_stopper_new();
+
+        g_object_ref (info->adding_msg);
+
+        /* thread reference */
+        g_object_ref (info->self);
+        _tny_camel_folder_reason (priv);
+
+        _tny_camel_queue_launch (TNY_FOLDER_PRIV_GET_QUEUE (priv), 
+                tny_camel_folder_add_msg_async_thread, 
+                tny_camel_folder_add_msg_async_cancelled_callback,
+                tny_camel_folder_add_msg_async_cancelled_destroyer, &info->cancelled,
+                info, __FUNCTION__);
+
+        return;
+}
+
-
-static void 
@@ -990 +1257 @@
-}
-
-/* When using a #GMainLoop this method will execute a callback using
- * g_idle_add_full.  Note that without a #GMainLoop, the callbacks
- * could happen in a worker thread (depends on who call it) at an
- * unknown moment in time (check your locking in this case). */
-
-static void
-execute_callback (gint depth, 
-                  gint priority,
-                  GSourceFunc idle_func,
-                  gpointer data, 
-                  GDestroyNotify destroy_func)
-{
-        if (depth > 0){
-                g_idle_add_full (priority, idle_func, data, destroy_func);
-        } else {
-                idle_func (data);
-                destroy_func (data);
-        }
-}
-
-
@@ -1064 +1312 @@
-{
-        TnyFolder *self;
-Sync
+
-        TnyStatusCallback status_callback;
-        gpointer user_data;
@@ -1243 +1491 @@
-
-void 
-Sync
+
-{
-        SyncFolderInfo *info;
@@ -1291 +1539 @@
-
-void 
-Sync
+
-{
-        TNY_CAMEL_FOLDER_GET_CLASS (self)->sync_async_func (self, expunge, callback, status_callback, user_data);
@@ -1300 +1548 @@
-{
-        TnyFolder *self;
-Refresh
+
-        TnyStatusCallback status_callback;
-        gpointer user_data;
@@ -1453 +1701 @@
-
-static void
-Refresh
+
-{
-        TNY_CAMEL_FOLDER_GET_CLASS (self)->refresh_async_func (self, callback, status_callback, user_data);
@@ -1502 +1750 @@
-
-static void
-Refresh
+
-{
-        RefreshFolderInfo *info;
@@ -5049 +5297 @@
-        TnyFolderIface *klass = (TnyFolderIface *)g;
-
+        klass->add_msg_async_func = tny_camel_folder_add_msg_async;
-        klass->get_msg_remove_strategy_func = tny_camel_folder_get_msg_remove_strategy;
-        klass->set_msg_remove_strategy_func = tny_camel_folder_set_msg_remove_strategy;
@@ -5111 +5360 @@
-        object_class->finalize = tny_camel_folder_finalize;
-
+        class->add_msg_async_func = tny_camel_folder_add_msg_async_default;
-        class->get_msg_receive_strategy_func = tny_camel_folder_get_msg_receive_strategy_default;
-        class->set_msg_receive_strategy_func = tny_camel_folder_set_msg_receive_strategy_default;

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

@@ -54 +54 @@
-
-        /* virtual methods */
+        void (*remove_msg_func) (TnyFolder *self, TnyHeader *header, GError **err);
-        void (*add_msg_func) (TnyFolder *self, TnyMsg *msg, GError **err);
-remove_msg_func) (TnyFolder *self, TnyHeader *header, GError **err
+add_msg_async_func) (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data
-        void (*sync_func) (TnyFolder *self, gboolean expunge, GError **err);
-Sync
+
-        TnyMsgRemoveStrategy* (*get_msg_remove_strategy_func) (TnyFolder *self);
-        void (*set_msg_remove_strategy_func) (TnyFolder *self, TnyMsgRemoveStrategy *st);
@@ -75 +76 @@
-        guint (*get_local_size_func) (TnyFolder *self);
-        gboolean (*is_subscribed_func) (TnyFolder *self);
-Refresh
+
-        void (*refresh_func) (TnyFolder *self, GError **err);
-        void (*transfer_msgs_func) (TnyFolder *self, TnyList *headers, TnyFolder *folder_dst, gboolean delete_originals, GError **err);

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

@@ -1064 +1064 @@
-        g_assert (CAMEL_IS_SESSION (apriv->session));
-
+/*
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err, 
-                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_GET_FOLDERS))
-                return;
-
+
-        if (query != NULL)
-                g_assert (TNY_IS_FOLDER_STORE_QUERY (query));
@@ -1162 +1163 @@
-          }
-        }
+/*
-        _tny_session_stop_operation (apriv->session);
+*/
-        return;
-}
@@ -1253 +1256 @@
-        info->cancelled = FALSE;
-        if (info->err != NULL) {
-
+info->
-                        info->cancelled = TRUE;
-        }
@@ -1336 +1339 @@
-        info->depth = g_main_depth ();
-
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), &err, 
-                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_GET_FOLDERS))
-        {
-                if (callback) {
-                        info->err = g_error_copy (err);
-                        if (info->query)
-                                g_object_ref (info->query);
-                        g_object_ref (info->self);
-                        g_object_ref (info->list);
-
-                        execute_callback (info->depth, G_PRIORITY_DEFAULT, 
-                                tny_camel_store_account_get_folders_async_cancelled_callback, info,
-                                tny_camel_store_account_get_folders_async_cancelled_destroyer);
-                }
-                g_error_free (err);
-                return;
-        }
-
-        /* thread reference */
-        g_object_ref (info->self);
@@ -1360 +1345 @@
-                g_object_ref (info->query);
-
-
+_wflags
-                tny_camel_store_account_get_folders_async_thread,
-                tny_camel_store_account_get_folders_async_cancelled_callback,
-                tny_camel_store_account_get_folders_async_cancelled_destroyer, 
-
+
+
-
-        return;
@@ -1716 +1702 @@
- * url-string and/or proto setting of @self). */
-
+static gboolean 
+cancelled_conn (gpointer user_data)
+{
+        return FALSE;
+}
+
+static void 
+cancelled_conn_destroy (gpointer user_data)
+{
+        GoingOnlineInfo *info = (GoingOnlineInfo *) user_data;
+        g_object_unref (info->self);
+        camel_object_unref (info->session);
+        g_slice_free (GoingOnlineInfo, info);
+        return;
+}
+
-void
-_tny_camel_store_account_queue_going_online (TnyCamelStoreAccount *self, TnySessionCamel *session, gboolean online, go_online_callback_func done_func, gpointer user_data)
@@ -1740 +1742 @@
-        /* It's indeed a very typical queue operation */
-
-
+
+
+
+
-                tny_camel_store_account_queue_going_online_thread,
-
-
+
+
+
-
-        return;

trunk/libtinymail/tny-folder.c

@@ -586 +586 @@
- **/
-void 
-Sync
+
-{
-#ifdef DBC /* require */
@@ -596 +596 @@
-        return;
-}
+
+
+/**
+ * tny_folder_add_msg_async:
+ * @self: a #TnyFolder object
+ * @msg: a #TnyMsg object
+ * @callback: a callback that'll happen when adding is finished
+ * @status_callback: a status callback
+ * @user_data: user data for the status callback and callback
+ *
+ * Add a message to a folder. It's recommended to destroy @msg afterwards because 
+ * after receiving the same message from the folder again, the instance wont be
+ * the same anymore and a property like the tny_msg_get_id might have changed
+ * and assigned too.
+ * 
+ * Folder observers of @self will get a header-added trigger caused by this
+ * action.
+ **/
+void 
+tny_folder_add_msg_async (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
+{
+#ifdef DBC /* require */
+        g_assert (TNY_IS_FOLDER (self));
+        g_assert (msg);
+        g_assert (TNY_IS_MSG (msg));
+        g_assert (TNY_FOLDER_GET_IFACE (self)->add_msg_async_func != NULL);
+#endif
+        TNY_FOLDER_GET_IFACE (self)->add_msg_async_func (self, msg, callback, status_callback, user_data);
+        return;
+}
+
-
-/**
@@ -744 +775 @@
- **/
-void
-Refresh
+
-{
-#ifdef DBC /* require */

trunk/libtinymail/tny-folder.h

@@ -91 +91 @@
-        void (*remove_msg_func) (TnyFolder *self, TnyHeader *header, GError **err);
-        void (*add_msg_func) (TnyFolder *self, TnyMsg *msg, GError **err);
+        void (*add_msg_async_func) (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-        void (*sync_func) (TnyFolder *self, gboolean expunge, GError **err);
-Sync
+
-        TnyMsgRemoveStrategy* (*get_msg_remove_strategy_func) (TnyFolder *self);
-        void (*set_msg_remove_strategy_func) (TnyFolder *self, TnyMsgRemoveStrategy *st);
@@ -110 +111 @@
-        guint (*get_local_size_func) (TnyFolder *self);
-        gboolean (*is_subscribed_func) (TnyFolder *self);
-Refresh
+
-        void (*refresh_func) (TnyFolder *self, GError **err);
-        void (*transfer_msgs_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err);
@@ -133 +134 @@
-void tny_folder_set_msg_receive_strategy (TnyFolder *self, TnyMsgReceiveStrategy *st);
-void tny_folder_remove_msg (TnyFolder *self, TnyHeader *header, GError **err);
+void tny_folder_remove_msg_async (TnyFolder *self, TnyHeader *header, GError **err);
-void tny_folder_add_msg (TnyFolder *self, TnyMsg *msg, GError **err);
+void tny_folder_add_msg_async (TnyFolder *self, TnyMsg *msg, TnyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-void tny_folder_sync (TnyFolder *self, gboolean expunge, GError **err);
-Sync
+
-TnyMsg* tny_folder_get_msg (TnyFolder *self, TnyHeader *header, GError **err);
-TnyMsg* tny_folder_find_msg (TnyFolder *self, const gchar *url_string, GError **err);
@@ -149 +152 @@
-guint tny_folder_get_local_size (TnyFolder *self);
-gboolean tny_folder_is_subscribed (TnyFolder *self);
-Refresh
+
-void tny_folder_refresh (TnyFolder *self, GError **err);
-void tny_folder_transfer_msgs (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, GError **err);

trunk/libtinymail/tny-merge-folder.c

@@ -138 +138 @@
-{
-        TnyFolder *self;
-Refresh
+
-        TnyStatusCallback status_callback;
-        gpointer user_data;
@@ -235 +235 @@
-
-static void
-Sync
+
-{
-        SyncFolderInfo *info;
@@ -817 +817 @@
-{
-        TnyFolder *self;
-Refresh
+
-        TnyStatusCallback status_callback;
-        gpointer user_data;
@@ -927 +927 @@
-
-static void
-Refresh
+
-{
-        RefreshFolderInfo *info;

trunk/libtinymail/tny-shared.h

@@ -57 +57 @@
-typedef struct _TnyStream TnyStream;
-typedef struct _TnyStreamIface TnyStreamIface;
-typedef gchar* (*TnyGetPassFunc) (TnyAccount *self, const gchar *prompt, gboolean *cancel);
-typedef void (*TnyForgetPassFunc) (TnyAccount *self);
-typedef void (*TnyRefreshFolderCallback) (TnyFolder *self, gboolean cancelled, GError *err, gpointer user_data);
-typedef void (*TnyGetHeadersCallback) (TnyFolder *self, gboolean cancelled, TnyList *headers, GError *err, gpointer user_data);
-typedef void (*TnyGetMsgCallback) (TnyFolder *folder, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data);
-typedef void (*TnySyncFolderCallback) (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data);
-typedef void (*TnyTransferMsgsCallback) (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data);
-typedef void (*TnyStatusCallback) (GObject *self, TnyStatus *status, gpointer user_data);
-typedef enum _TnyHeaderFlags TnyHeaderFlags;
-typedef enum _TnyHeaderPriorityFlags TnyHeaderPriorityFlags;
@@ -82 +74 @@
-typedef struct _TnyFolderStoreQueryItem TnyFolderStoreQueryItem;
-typedef struct _TnyFolderStoreQueryItemClass TnyFolderStoreQueryItemClass;
-typedef void (*TnyGetFoldersCallback) (TnyFolderStore *self, gboolean cancelled, TnyList *list, GError *err, gpointer user_data);
-typedef void (*TnyCopyFolderCallback) (TnyFolder *self, gboolean cancelled, TnyFolderStore *into, TnyFolder *new_folder, GError *err, gpointer user_data);
-typedef enum _TnyFolderSignal TnyFolderSignal;
-typedef enum _TnyDeviceSignal TnyDeviceSignal;
@@ -125 +115 @@
-typedef enum _TnyConnectionStatus TnyConnectionStatus;
-
+typedef gchar* (*TnyGetPassFunc) (TnyAccount *self, const gchar *prompt, gboolean *cancel);
+typedef void (*TnyForgetPassFunc) (TnyAccount *self);
+typedef void (*TnyFolderCallback) (TnyFolder *self, gboolean cancelled, GError *err, gpointer user_data);
+typedef void (*TnyGetHeadersCallback) (TnyFolder *self, gboolean cancelled, TnyList *headers, GError *err, gpointer user_data);
+typedef void (*TnyGetMsgCallback) (TnyFolder *folder, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data);
+typedef void (*TnyTransferMsgsCallback) (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data);
+typedef void (*TnyStatusCallback) (GObject *self, TnyStatus *status, gpointer user_data);
+typedef void (*TnyGetFoldersCallback) (TnyFolderStore *self, gboolean cancelled, TnyList *list, GError *err, gpointer user_data);
+typedef void (*TnyCopyFolderCallback) (TnyFolder *self, gboolean cancelled, TnyFolderStore *into, TnyFolder *new_folder, GError *err, gpointer user_data);
+
-G_END_DECLS
-

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

@@ -397 +397 @@
-        }
-
-
+
+
+
+
-
-        /* Add an observer for the root folder store, so that we can observe 
@@ -405 +408 @@
-        self->store_observables = g_list_prepend (self->store_observables, folder_store);
-
-g_object_unref (G_OBJECT (folders));
+/* g_object_unref (G_OBJECT (folders)); */
-
-        return;