Changeset 1956

Timestamp:

05/15/07 19:39:36

Author:

pvanhoof

Message:

A new implementation for tny_folder_copy_async

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (11 diffs)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * A new implementation for tny_folder_copy in libtinymail-camel
+        * A new implementation for tny_folder_copy_async in libtinymail-camel
+        * Changed the TnyCopyFolderCallback function description
+
+        * This was a major API change
-
-2007-05-14  Philip Van Hoof  <pvanhoof@gnome.org>

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

@@ -1784 +1784 @@
-}
-
-TnyFolder
-default (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err
+CpyRecRet
+shared (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err, GList *rems, GList *adds
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
@@ -1793 +1793 @@
-        GError *nerr = NULL;
-
-
-
-
-
-
+
-
-        g_static_rec_mutex_lock (priv->folder_lock);
@@ -1860 +1856 @@
-        {
-                CpyRecRet *cpyr;
-
-                tny_debug ("tny_folder_copy: recurse_copy\n");
-                cpyr = recurse_copy (self, into, new_name, del, &nerr, adds, rems);
@@ -1869 +1864 @@
-        }
-
+        retc->created = retval;
+        retc->adds = adds;
+        retc->rems = rems;
+
+        g_static_rec_mutex_unlock (priv->folder_lock);
+
+        return retc;
+}
+
+static TnyFolder*
+tny_camel_folder_copy_default (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        GList *rems=NULL, *adds=NULL;
+        TnyFolder *retval = NULL;
+        GError *nerr = NULL;
+        CpyRecRet *cpyr;
+
+        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err, 
+                        TNY_FOLDER_ERROR, TNY_FOLDER_ERROR_COPY))
+                return NULL;
+
+        cpyr = tny_camel_folder_copy_shared (self, into, new_name, del, &nerr, rems, adds);
+
+        retval = cpyr->created;
+        rems = cpyr->rems;
+        adds = cpyr->adds;
+
+        g_slice_free (CpyRecRet, cpyr);
+
-        if (nerr != NULL)
+        {
-                g_propagate_error (err, nerr);
-
+
+
-                notify_folder_observers_about_copy (adds, rems, del);
-
-        g_static_rec_mutex_unlock (priv->folder_lock);
-
-        _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
-
@@ -1882 +1907 @@
-
-
-
-
-
-typedef struct 
-{
-        TnyFolder *self;
-        TnyFolderStore *from;
-        TnyFolderStore *into;
-        gchar *new_name;
-        gboolean delete_originals;
-        GError *err;
+
-        gpointer user_data;
-        guint depth;
@@ -1901 +1923 @@
-        TnyIdleStopper *stopper;
-        gboolean cancelled;
+        GList *rems, *adds;
-} CopyFolderInfo;
-
-
-static void 
-inform_observers_about_folder_copy (TnyFolder *self, TnyFolderStore *from, TnyFolderStore *to, gboolean del_orig, const gchar *new_name, TnyFolder *new_folder)
-{
-        TnyFolderStoreChange *tochange = tny_folder_store_change_new (to);
-        TnyFolderStoreChange *fromchange = tny_folder_store_change_new (from);
-        TnyFolderChange *origchange = tny_folder_change_new (self);
-/*      TnyList *folders = tny_simple_list_new (); */
-/*      TnyIterator *iter; */
-        
-        /* Notify change name (if neccesary) */
-        if (to == from && del_orig) {
-                if (strcmp (tny_folder_get_name (self), new_name)) {            
-                        tny_folder_change_set_rename (origchange, new_name);
-                        notify_folder_observers_about (self, origchange);
-                }
-        }
-                
-        /* Notify deletion  (if neccesary) */
-        if (del_orig) {
-                tny_folder_store_change_add_removed_folder (fromchange, self);
-                notify_folder_store_observers_about (from, fromchange);
-        }
-
-        /* Notify addition */
-        tny_folder_store_change_add_created_folder (tochange, new_folder);
-        notify_folder_store_observers_about (to, tochange);
-        
-        /* Notify subfolders addition */
-/*      tny_folder_store_get_folders (TNY_FOLDER_STORE(self), folders, NULL, NULL); */
-/*      iter = tny_list_create_iterator (folders); */
-/*      while (!tny_iterator_is_done (iter)) { */
-                
-/*              TnyFolder *folder = (TnyFolder*) tny_iterator_get_current (iter); */
-/*              TnyFolderStoreChange *change = tny_folder_store_change_new (TNY_FOLDER_STORE(self)); */
-/*              tny_folder_store_change_add_created_folder (change, folder); */
-/*              notify_folder_store_observers_about (TNY_FOLDER_STORE(self), change); */
-
-/*              tny_iterator_next (iter); */
-
-/*              g_object_unref (G_OBJECT (folder)); */
-/*              g_object_unref (G_OBJECT (change)); */
-/*      } */
-        
-        /* Free */
-/*      g_object_unref (G_OBJECT (iter)); */
-/*      g_object_unref (G_OBJECT (folders)); */
-        g_object_unref (G_OBJECT (tochange));
-        g_object_unref (G_OBJECT (fromchange));
-        g_object_unref (G_OBJECT (origchange));
-}
-
-static void
-tny_camel_folder_copy_async_destroyer (gpointer thr_user_data)
-{
-        CopyFolderInfo *info = (CopyFolderInfo *) thr_user_data;
+        TnyFolderChange *change;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        /* thread reference */
+        g_object_ref (G_OBJECT (info->into));
+        g_object_unref (G_OBJECT (info->self));
-        _tny_camel_folder_unreason (priv);
-        g_object_unref (G_OBJECT (info->self));
-        _tny_camel_folder_unreason (priv_to);
-        g_object_unref (G_OBJECT (info->into));
-        _tny_camel_folder_unreason (priv_from);
-        g_object_unref (G_OBJECT (info->from));
-
-        if (info->err)
@@ -1985 +1952 @@
-        tny_idle_stopper_destroy (info->stopper);
-        info->stopper = NULL;
-
-
+
+
-        g_slice_free (CopyFolderInfo, info);
-}
@@ -1996 +1963 @@
-
-        if (info->callback)
-
+
+
-
-        /* Prevent status callbacks from being called after this
@@ -2035 +2003 @@
-        CopyFolderInfo *info = thr_user_data;
-        TnyFolder *self = info->self;
-
-
-
-
-
-
+
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
-CamelException ex = CAMEL_EXCEPTION_INITIALISER
-GError *err = NULL
+GError *nerr = NULL
+CpyRecRet *cpyr
-
-        g_static_rec_mutex_lock (priv->folder_lock);
-
-        /* Load oldparent foler */
-        if (!load_folder_no_lock (priv_from))
-        {
-                tny_camel_folder_copy_async_destroyer (info);
-                g_static_rec_mutex_unlock (priv->folder_lock);
-                g_thread_exit (NULL);
-                return NULL;
-        }
-
-        /* Load directory to move */
-        if (!load_folder_no_lock (priv))
-        {
-                tny_camel_folder_copy_async_destroyer (info);
-                g_static_rec_mutex_unlock (priv->folder_lock);
-                g_thread_exit (NULL);
-                return NULL;
-        }
-
-        /* Load new_parent foler */
-        if (!load_folder_no_lock (priv_dst))
-        {
-                tny_camel_folder_copy_async_destroyer (info);
-                g_static_rec_mutex_unlock (priv->folder_lock);
-                g_thread_exit (NULL);
-                return NULL;
-        }
-
-        info->cancelled = FALSE;
-
-        /* start camel operations */
-        _tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (priv->account), 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        info->cancelled = camel_operation_cancel_check (apriv->cancel);
+
-        _tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account));
-
-        /* Get data */
-        info->new_folder = new_folder;
-
-        /* Stop operation and check errors */
-        info->err = NULL;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        g_static_rec_mutex_unlock (priv->folder_lock);
-
-        /* Call calback if it exists */
-        if (info->callback)
-        {
@@ -2118 +2052 @@
-                }
-        } else { /* Thread reference */
-
+
+
-                _tny_camel_folder_unreason (priv);
-                g_object_unref (G_OBJECT (into));
-                _tny_camel_folder_unreason (priv_dst);
-                g_object_unref (G_OBJECT (from));
-                _tny_camel_folder_unreason (priv_from);
-        }
-        g_thread_exit (NULL);
@@ -2140 +2071 @@
-tny_camel_folder_copy_async_default (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, TnyCopyFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data)
-{
-
-
+
+
+
-        GError *err = NULL;
-        TnyFolderStore *from = NULL;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyCamelFolderPriv *priv_to = TNY_CAMEL_FOLDER_GET_PRIVATE (into);
-        TnyCamelFolderPriv *priv_from = NULL;
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), &err, 
-REFRESH
+COPY
-        {
-                if (callback)
-        callback (self, info->into, info->new_name, TRUE, &info->
+       callback (self, into, TRUE, NULL, &
-                g_error_free (err);
-                return;
-        }
-
-        from = tny_folder_get_folder_store (self);
-        priv_from = TNY_CAMEL_FOLDER_GET_PRIVATE (from);
-
-        /* Idle info for the status callback: */
-        info = g_slice_new (CopyFolderInfo);
-
+
+
+
+
-        info->into = into;
-        info->new_name = g_strdup(new_name);
-        info->delete_originals = del;
-        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
-        info->err = NULL;
-        info->self = self;
-        info->callback = callback;
-        info->status_callback = status_callback;
-        info->user_data = user_data;
-        info->depth = g_main_depth ();
-
+
+
+
+
-        /* Use a ref count because we do not know which of the 2 idle callbacks 
-         * will be the last, and we can only unref self in the last callback:
-
+ 
-
-        info->stopper = tny_idle_stopper_new();
-
-        /* thread reference */
+        _tny_camel_folder_reason (priv);
-        g_object_ref (G_OBJECT (info->self));
-        _tny_camel_folder_reason (priv);
-        g_object_ref (G_OBJECT (info->into));
-        _tny_camel_folder_reason (priv_to);
-        _tny_camel_folder_reason (priv_from);
-
-        /* This will cause the idle status callback to be called,
-         * via _tny_camel_account_start_camel_operation,
-         * and also calls the idle main callback: */
-
-        thread = g_thread_create (tny_camel_folder_copy_async_thread,

trunk/libtinymail/tny-shared.h

@@ -81 +81 @@
-typedef struct _TnyFolderStoreQueryItemClass TnyFolderStoreQueryItemClass;
-typedef void (*TnyGetFoldersCallback) (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data);
-const gchar *new_name, gboolean cancelled
+gboolean cancelled, TnyFolder *new_folder
-typedef enum _TnyFolderSignal TnyFolderSignal;
-typedef enum _TnyDeviceSignal TnyDeviceSignal;