Changeset 2553

Timestamp:

08/06/07 10:14:38

Author:

pvanhoof

Message:

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

• • • • GDK lock awareness
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (18 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (43 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (14 diffs)
• trunk/libtinymail-camel/tny-camel-store-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (11 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (2 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-device.c (modified) (7 diffs)
• trunk/libtinymail-gpe/tny-gpe-device.c (modified) (12 diffs)
• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (13 diffs)
• trunk/libtinymail-maemo/tny-maemo-device-priv.h (added)
• trunk/libtinymail-maemo/tny-maemo-device.c (modified) (12 diffs)
• trunk/libtinymail-olpc/tny-olpc-device.c (modified) (10 diffs)
• trunk/libtinymail/tny-combined-account.c (modified) (1 diff)
• trunk/libtinymail/tny-common-priv.h (modified) (2 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (7 diffs)
• trunk/libtinymail/tny-progress-info.c (modified) (5 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (5 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.c (modified) (1 diff)
• trunk/tests/shared/device.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-08-06  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * GDK lock awareness
+
-2007-08-02  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -3207 +3207 @@
-        g_return_if_fail(mi != NULL);
-
-
+
+
-                CAMEL_SUMMARY_LOCK(mi->summary, ref_lock);
-

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

@@ -70 +70 @@
-        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-
+        tny_lockable_lock (apriv->session->priv->ui_lock);
-        g_signal_emit (G_OBJECT (self), 
-                tny_account_signals [TNY_ACCOUNT_CHANGED], 0);
+        tny_lockable_unlock (apriv->session->priv->ui_lock);
-
-        return FALSE;
@@ -625 +627 @@
-        RefreshStatusInfo *oinfo = user_data;
-        TnyProgressInfo *info = NULL;
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (oinfo->self);
-
-        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
-                oinfo->domain, oinfo->code, what, sofar, 
-
+apriv->session->priv->ui_lock, 
-
-        if (oinfo->depth > 0)
@@ -1221 +1224 @@
- * queue of @self (else it's a bug). */
-
+typedef struct {
+        TnySessionCamel *session;
+        TnyAccount *account;
+        gboolean online;
+} SetOnlInfo;
+
+
+static gboolean
+set_online_happened_idle (gpointer user_data)
+{
+        SetOnlInfo *info = (SetOnlInfo *) user_data;
+        tny_lockable_lock (info->session->priv->ui_lock);
+        g_signal_emit (info->account, 
+                tny_camel_account_signals [TNY_CAMEL_ACCOUNT_SET_ONLINE_HAPPENED], 
+                0, info->online);
+        tny_lockable_unlock (info->session->priv->ui_lock);
+        return FALSE;
+}
+
+static void
+set_online_happened_destroy (gpointer user_data)
+{
+        SetOnlInfo *info = (SetOnlInfo *) user_data;
+        camel_object_unref (info->session);
+        g_object_unref (info->account);
+        g_slice_free (SetOnlInfo, info);
+        return;
+}
+
+static void
+set_online_happened (TnySessionCamel *session, TnyCamelAccount *account, gboolean online)
+{
+        SetOnlInfo *info = g_slice_new (SetOnlInfo);
+
+        info->session = session;
+        camel_object_ref (info->session);
+        info->account = TNY_ACCOUNT (g_object_ref (account));
+        info->online = online;
+
+        g_idle_add_full (G_PRIORITY_DEFAULT, set_online_happened_idle, 
+                info, set_online_happened_destroy);
+
+        return;
+}
+
+
-void 
-_tny_camel_account_set_online (TnyCamelAccount *self, gboolean online, GError **err)
@@ -1269 +1318 @@
-
-                        if (!camel_exception_is_set (&ex))
-
-
+
-
-                        goto done;
@@ -1309 +1357 @@
-
-                        if (!camel_exception_is_set (&ex))
-
-
+
-
-                        goto done;
@@ -1346 +1393 @@
-
-                if (!camel_exception_is_set (&ex))
-
-
+
-
-        }
@@ -1404 +1450 @@
-{
-        OnSetOnlineInfo *info = (OnSetOnlineInfo *) data;
-
+
+
+
+
+
-                info->callback (info->account, info->err);
+                tny_lockable_unlock (session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -1493 +1545 @@
-tny_camel_account_set_online_default (TnyCamelAccount *self, gboolean online, TnyCamelSetOnlineCallback callback)
-{
+        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
+        TnySessionCamel *session = priv->session;
-
-        /* In case we  are a store account, this means that we need to throw the 
@@ -1498 +1552 @@
-
-        if (TNY_IS_CAMEL_STORE_ACCOUNT (self))
-        {
-                TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-                TnySessionCamel *session = priv->session;
-
-                _tny_camel_store_account_queue_going_online (
-                        TNY_CAMEL_STORE_ACCOUNT (self), session, online, 
-                        on_set_online_done, (gpointer) callback);
-        }
-
-
@@ -1514 +1563 @@
-
-        if (TNY_IS_CAMEL_TRANSPORT_ACCOUNT (self))
-
-
-
-
-
+
-}
-
@@ -1775 +1820 @@
-        gboolean cancelled;
-        TnyList *result;
-        /* This stops us from calling a status callback after the operation has 
-         * finished. */
-        TnyIdleStopper* stopper;
-        GError *err;
-        TnySessionCamel *session;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
-} GetSupportedAuthInfo;
+
+
+static gboolean 
+on_supauth_idle_func (gpointer user_data)
+{
+        GetSupportedAuthInfo *info = (GetSupportedAuthInfo *) user_data;
+
+        if (info->callback) {
+                tny_lockable_lock (info->session->priv->ui_lock);
+                info->callback (info->self, info->cancelled, info->result, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
+
+        tny_idle_stopper_stop (info->stopper);
+}
+
+static void 
+on_supauth_destroy_func (gpointer user_data)
+{
+        GetSupportedAuthInfo *info = (GetSupportedAuthInfo *) user_data;
+
+        /* Thread reference */
+        g_object_unref (info->self);
+        camel_object_ref (info->session);
+
+        /* Result reference */
+        if (info->result)
+                g_object_unref (info->result);
+
+        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);
+        }
+}
-
-/* Starts the operation in the thread: */
@@ -1793 +1880 @@
-        GError *err = NULL;
-        TnyStatus* status;
+        GList *authtypes = NULL;
+        TnyList *result = NULL;
+        GList *iter = NULL;
-
-        g_static_rec_mutex_lock (priv->service_lock);
@@ -1800 +1890 @@
-                "Get secure authentication methods");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                CamelServiceAuthType *item = (CamelServiceAuthType *)iter->data;
-                if (item) {
-                        /* Get the name of the auth method:
-                         * Note that, at least for IMAP, authproto=NULL when 
-                         * name=Password. */
-
-                        /* We don't use the value part of the TnyPair. */
-                        TnyPair *pair = tny_pair_new (item->name, NULL);
-                        tny_list_append (result, G_OBJECT (pair));
-                        g_object_unref (pair);
-                }
-                
-                iter = g_list_next (iter);
-        }
+
-        g_list_free (authtypes);
-        authtypes = NULL;
-        
-        
-        /* The work has finished, so clean up and provide the result via the 
-         * main callback: */
-        info->result = result;
-
-        /* Create the GError if necessary,
-         * from the CamelException: */
-        info->err = NULL;
-        if (camel_exception_is_set (&ex))
@@ -1853 +1922 @@
-        g_static_rec_mutex_unlock (priv->service_lock);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        tny_status_free(status);
-        g_thread_exit (NULL);
-
-        return NULL;
@@ -1868 +1947 @@
-
-
-/*TODO: This should be a vfunc so that it is generally available 
- * (and implementable) for other imlpementations. But this should not need a 
- * TnyAccount instance, so we need to find some other object to put the vfunc. 
- */
- 
-/** 
- * TnyCamelGetSupportedSecureAuthCallback:
@@ -1902 +1976 @@
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
-        GetSupportedAuthInfo *info = NULL;
-
-        g_return_if_fail (callback);
-        g_return_if_fail (priv->session);
-
-        /* Store all the interesting info in a struct 
-         * launch a thread and keep that struct-instance around.
-         * - While the thread is running, we regularly call the status callback in 
-         * an idle handler.
-         * - When the thread is finished, the main callback will 
-         * then be called in an idle handler.
-         */
-
-        /* Check that the session is ready, and stop with a GError if it is not: */
-        GError *err = NULL;
+
-        if (!_tny_session_check_operation (priv->session, TNY_ACCOUNT (self), &err, 
-                        TNY_ACCOUNT_ERROR, TNY_ACCOUNT_ERROR_GET_SUPPORTED_AUTH))
@@ -1925 +1987 @@
-        }
-
-
-        /* Idle info for the status callback: */
-        info = g_slice_new (GetSupportedAuthInfo);
-        info->session = priv->session;
@@ -1936 +1996 @@
-        info->user_data = user_data;
-        
-        /* 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:
-         * This is destroyed in the idle GDestroyNotify callback.
-         * A shared copy is taken and released by the _tny_progress* callback,
-         * so that it can prevent the stats callback from being called after 
-         * the main callback. */
-        info->stopper = tny_idle_stopper_new();
-
-        /* thread reference */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -78 +78 @@
-static GObjectClass *parent_class = NULL;
-
+
+typedef struct { 
+        GObject *self;
+        GObject *change; 
+} NotFolObInIdleInfo;
+
+static void 
+do_notify_in_idle_destroy (gpointer user_data)
+{
+        NotFolObInIdleInfo *info = (NotFolObInIdleInfo *) user_data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
+        g_object_unref (info->change);
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (info->self);
+        g_slice_free (NotFolObInIdleInfo, info);
+}
+
-static void
-notify_folder_store_observers_about (TnyFolderStore *self, TnyFolderStoreChange *change)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
-        TnyIterator *iter;
-        TnyList *list;
-
-        g_static_rec_mutex_lock (priv->obs_lock);
-
-        if (!priv->sobservers) {
-                g_static_rec_mutex_unlock (priv->obs_lock);
-                return;
-        }
-
-        list = tny_list_copy (priv->sobservers);
-        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        iter = tny_list_create_iterator (list);
-
-        while (!tny_iterator_is_done (iter))
-        {
-                TnyFolderStoreObserver *observer = TNY_FOLDER_STORE_OBSERVER (tny_iterator_get_current (iter));
-
+
-                tny_folder_store_observer_update (observer, change);
-
+
+
-                tny_iterator_next (iter);
-        }
-
-
+
-        g_object_unref (list);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void
@@ -115 +155 @@
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account);
-        TnyIterator *iter;
-        TnyList *list;
-
-        g_static_rec_mutex_lock (priv->obs_lock);
-
-        if (!priv->observers) {
-                g_static_rec_mutex_unlock (priv->obs_lock);
-                return;
-        }
-
-        list = tny_list_copy (priv->observers);
-        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        iter = tny_list_create_iterator (list);
-
-        while (!tny_iterator_is_done (iter))
-        {
-                TnyFolderObserver *observer = TNY_FOLDER_OBSERVER (tny_iterator_get_current (iter));
+                tny_lockable_lock (apriv->session->priv->ui_lock);
-                tny_folder_observer_update (observer, change);
-
+
+
-                tny_iterator_next (iter);
-        }
-
-
+
-        g_object_unref (list);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void 
@@ -164 +283 @@
-        tny_folder_change_set_new_unread_count (change, priv->unread_length);
-        tny_folder_change_set_new_all_count (change, priv->cached_length);
-
+_in_idle
-        g_object_unref (change);
-}
@@ -617 +736 @@
-                tny_folder_change_set_new_unread_count (change, priv->unread_length);
-
-
-
-G_OBJECT (change)
+_in_idle
+
+change
-
-                if (dst_orig_uids) {
@@ -691 +810 @@
-        change = tny_folder_change_new (self);
-        tny_folder_change_add_expunged_header (change, header);
-
+_in_idle
-        g_object_unref (change);
-
@@ -994 +1113 @@
-        g_object_unref (change);
-
-
+
+
-                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);
@@ -1011 +1133 @@
-        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
-                TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_SYNC, what, sofar, 
-
+session->priv->ui_lock, oinfo->
-
-        execute_callback (oinfo->depth, G_PRIORITY_HIGH,
@@ -1110 +1232 @@
-{
-        SyncFolderInfo *info = thr_user_data;
-
+
+
-                info->callback (info->self, TRUE, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -1230 +1355 @@
-        g_object_unref (change);
-
-
+
+
-                info->callback (info->self, info->cancelled, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-
-        /* Prevent status callbacks from being called after this
@@ -1251 +1379 @@
-        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
-                TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_REFRESH, what, sofar, 
-
+
+
-
-        execute_callback (oinfo->depth, G_PRIORITY_HIGH,
@@ -1354 +1483 @@
-{
-        RefreshFolderInfo *info = thr_user_data;
-
+
+
-                info->callback (info->self, TRUE, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -1483 +1615 @@
-        tny_folder_change_set_new_all_count (change, priv->cached_length);
-        tny_folder_change_set_new_unread_count (change, priv->unread_length);
-
+_in_idle
-        g_object_unref (change);
-
@@ -1569 +1701 @@
-{
-        GetHeadersInfo *info = thr_user_data;
-
+
+
-                info->callback (info->self, FALSE, info->headers, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -1626 +1761 @@
-{
-        GetHeadersInfo *info = thr_user_data;
-
+
+
-                info->callback (info->self, TRUE, info->headers, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -1824 +1962 @@
-        }
-
-
+
+
-                info->callback (info->self, info->cancelled, info->msg, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-
-        if (info->msg)
@@ -1848 +1989 @@
-        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
-                TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_GET_MSG, what, sofar, 
-
+session->priv->ui_lock, oinfo->
-
-        execute_callback (oinfo->depth, G_PRIORITY_HIGH, 
@@ -1947 +2088 @@
-
-        GetMsgInfo *info = (GetMsgInfo *) thr_user_data;
-
+
+
-                info->callback (info->self, TRUE, NULL, &info->err, info->user_data);
+                tny_lockable_unlock (info->session->priv->ui_lock);
+        }
-        return FALSE;
-}
@@ -2089 +2233 @@
-                change = tny_folder_change_new (self);
-                tny_folder_change_set_received_msg (change, retval);
-
-G_OBJECT (change)
+_in_idle
+change
-        }
-
@@ -2442 +2586 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        rems = g_list_first (rems);
-
-        while (rems)
-        {
-                CpyEvent *evt = rems->data;
-
-
-                if (del) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-                cpy_event_free (evt);
-                rems = g_list_next (rems);
-        }
-
-        g_list_free (rems);
-
-        while (adds)
-        {
-                TnyFolderStoreChange *change;
-                CpyEvent *evt = adds->data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                cpy_event_free (evt);
-                adds = g_list_next (