Changeset 3704

Timestamp:

06/20/08 11:53:30

Author:

jdapena

Message:

* libtinymail-camel/tny-camel-folder.c:

• • • • Fix camel operation references
        

* libtinymail-camel/tny-camel-bs-mime-part.c:

• • • • Fix camel operation references
        

* libtinymail-camel/tny-camel-queue.c:

• • • • Make queue reference to account be weak.
        

* libtinymail-camel/tny-camel-account.c:

• • • • More camel operation reference fixes.
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-bs-mime-part.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-queue.c (modified) (9 diffs)

trunk/ChangeLog

@@ -1 +1 @@
-2008-06-20  Jose Dapena Paz  <jdapena@igalia.com>
+
+        * libtinymail-camel/tny-camel-folder.c:
+        Fix camel operation references
+
+        * libtinymail-camel/tny-camel-bs-mime-part.c:
+        Fix camel operation references
+
+        * libtinymail-camel/tny-camel-queue.c:
+        Make queue reference to account be weak.
+
+        * libtinymail-camel/tny-camel-account.c:
+        More camel operation reference fixes.
-
-        * libtinymail/tny-cached-file-stream.c:

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

@@ -775 +775 @@
-        priv->inuse_spin = TRUE;
-
-
+ {
-                _tny_camel_account_actual_uncancel (self);
+                camel_operation_unregister (priv->cancel);
+        }
-
-        priv->cancel = camel_operation_new (func, user_data);
-
-        camel_operation_ref (priv->cancel);
-        camel_operation_register (priv->cancel);
-        camel_operation_start (priv->cancel, (char*)what);
-

trunk/libtinymail-camel/tny-camel-bs-mime-part.c

@@ -557 +557 @@
-                if (fpriv->account && TNY_IS_CAMEL_ACCOUNT (fpriv->account)) {
-                        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (fpriv->account);
+                        camel_operation_ref (cancel);
-                        apriv->getmsg_cancel = cancel;
-                }
-        }
-
-        camel_operation_ref (cancel);
-        camel_operation_register (cancel);
-        camel_operation_start (cancel, (char *) "Getting message part");
@@ -589 +589 @@
-                        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (fpriv->account);
-                        apriv->getmsg_cancel = NULL;
+                        camel_operation_unref (cancel);
-                }
-        }

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

@@ -2509 +2509 @@
-                TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
-                apriv->getmsg_cancel = cancel;
+                camel_operation_ref (cancel);
-        }
-
@@ -2515 +2516 @@
-        /* g_static_rec_mutex_lock (priv->folder_lock); */
-
-        camel_operation_ref (cancel);
-        camel_operation_register (cancel);
-        camel_operation_start (cancel, (char *) "Getting message");
@@ -2536 +2536 @@
-                TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
-                apriv->getmsg_cancel = NULL;
+                camel_operation_unref (cancel);
-        }
-

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

@@ -40 +40 @@
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_QUEUE, TnyCamelQueuePriv))
-
+static void account_finalized (TnyCamelQueue *queue, GObject *finalized_account);
-
-static void
@@ -47 +48 @@
-
-        self->stopped = TRUE;
+
+        g_mutex_lock (self->mutex);
+        if (self->account)
+                g_object_weak_unref (G_OBJECT (self->account), (GWeakNotify) account_finalized, self);
+        g_mutex_unlock (self->mutex);
-
-        g_static_rec_mutex_lock (self->lock);
@@ -65 +71 @@
-}
-
+static void
+account_finalized (TnyCamelQueue *queue, GObject *finalized_account)
+{
+        g_mutex_lock (queue->mutex);
+        queue->account = NULL;
+        queue->stopped = TRUE;
+        if (queue->is_waiting) {
+                g_cond_broadcast (queue->condition);
+        }
+        g_mutex_unlock (queue->mutex);
+}
+
-/**
- * _tny_camel_queue_new
@@ -79 +97 @@
-
-        self->account = account;
+        g_object_weak_ref (G_OBJECT (account), (GWeakNotify) account_finalized, self);
-
-        return TNY_CAMEL_QUEUE (self);
@@ -176 +195 @@
-                if (queue->next_uncancel)
-                {
-
+
+
+
+
+
+
+
+
+
-                        queue->next_uncancel = FALSE;
-                }
@@ -256 +283 @@
-        queue->stopped = TRUE;
-
-        g_object_unref (queue->account);
-        g_object_unref (queue);
-
@@ -335 +361 @@
-                if (item->flags & TNY_CAMEL_QUEUE_CANCELLABLE_ITEM) {
-                        if (!(item->flags & TNY_CAMEL_QUEUE_SYNC_ITEM)) {
-
+
+
-                                queue->next_uncancel = TRUE;
-                        }
@@ -388 +415 @@
-
-        g_static_rec_mutex_lock (queue->lock);
+
+        if (queue->account == NULL)
+                g_assert ("We should never be running tny_camel_queue_launch_wflags if account was unreferenced");
-
-        if (flags & TNY_CAMEL_QUEUE_PRIORITY_ITEM) 
@@ -413 +443 @@
-                queue->stopped = FALSE;
-                g_object_ref (queue);
-                g_object_ref (queue->account);
-                queue->thread = g_thread_create (tny_camel_queue_thread_main_func, 
-                        queue, FALSE, &err);