Changeset 2499

Timestamp:

07/25/07 23:41:34

Author:

pvanhoof

Message:

Some reference counting problems when factoring folders

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (6 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-imap-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-store-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (modified) (4 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (5 diffs)

trunk/ChangeLog

@@ -5 +5 @@
-        * Disconnecting after summary retrieval of a POP folder
-        * Disconnecting after get-msg and sync of a POP folder
+        * Some reference counting problems when factoring folders
-
-2007-07-24  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c

@@ -492 +492 @@
-        pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-
+        if (!pop3_store->delete_after && !expunge)
+                return;
+
-        if (camel_disco_store_status (CAMEL_DISCO_STORE (pop3_store)) == CAMEL_DISCO_STORE_OFFLINE)
-                return;
@@ -518 +521 @@
-        }
-
+        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+
-        camel_operation_start(NULL, _("Expunging deleted messages"));
-
@@ -529 +534 @@
-                /* busy already?  wait for that to finish first */
-                if (fi->cmd) {
+                        g_static_rec_mutex_lock (pop3_store->eng_lock);
+                        if (pop3_store->engine == NULL) {
+                                g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                                return;
+                        }
+                        while (camel_pop3_engine_iterate(pop3_store->engine, fi->cmd) > 0)
+                                ;
+                        camel_pop3_engine_command_free(pop3_store->engine, fi->cmd);
+                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+
+                        fi->cmd = NULL;
+                }
+
+                /* This file is written by TnyCamelPopLocalMsgRemoveStrategy */
+                expunged_path = g_strdup_printf ("%s/%s.expunged", pop3_store->storage_path, fi->uid);
+                if (fi->flags & g_file_test (expunged_path, G_FILE_TEST_EXISTS)) 
+                {
+                        g_static_rec_mutex_lock (pop3_store->eng_lock);
+                        if (pop3_store->engine == NULL) {
+                                g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                                return;
+                        }
+                        fi->cmd = camel_pop3_engine_command_new(pop3_store->engine, 0, NULL, NULL, "DELE %u\r\n", fi->id);
+                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+
+                        g_unlink (expunged_path);
+                        /* also remove from cache */
+                        if (pop3_store->cache && fi->uid)
+                                camel_data_cache_remove(pop3_store->cache, "cache", fi->uid, NULL);
+                }
+
+                g_free (expunged_path);
+          }
+
+          for (i = 0; i < pop3_folder->uids->len; i++) {
+                fi = pop3_folder->uids->pdata[i];
+                /* wait for delete commands to finish */
+                if (fi->cmd) {
+
+                        g_static_rec_mutex_lock (pop3_store->eng_lock);
+
+                        if (pop3_store->engine == NULL) {
+                                g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                                return;
+                        }
+
-                        while (camel_pop3_engine_iterate(pop3_store->engine, fi->cmd) > 0)
-                                ;
-                        camel_pop3_engine_command_free(pop3_store->engine, fi->cmd);
-                        fi->cmd = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                }
-                camel_operation_progress(NULL, (i+1) , pop3_folder->uids->len);
@@ -574 +604 @@
-                {
-                        struct _CamelPOP3Command *cmd;
+
+                        g_static_rec_mutex_lock (pop3_store->eng_lock);
+
+                        if (pop3_store->engine == NULL) {
+                                g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                                return;
+                        }
+
-                        g_unlink (expunged_path);
-                        cmd = camel_pop3_engine_command_new(pop3_store->engine, 0, NULL, NULL, "DELE %u\r\n", info->uid);
@@ -580 +618 @@
-                                camel_data_cache_remove(pop3_store->cache, "cache", info->uid, NULL);
-                        camel_pop3_engine_command_free(pop3_store->engine, cmd);
+
+                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+
-                        camel_message_info_free((CamelMessageInfo *)info);
-                }
@@ -587 +628 @@
-
-        camel_operation_end(NULL);
-
-        g_static_rec_mutex_unlock (pop3_store->eng_lock);
-
-        camel_service_disconnect (CAMEL_SERVICE (pop3_store), TRUE, &dex);

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

@@ -837 +837 @@
-
-        g_static_rec_mutex_lock (pop3_store->eng_lock);
-
+
-        if (pop3_store->engine == NULL) {
-                g_static_rec_mutex_unlock (pop3_store->eng_lock);

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

@@ -4139 +4139 @@
-{
-        PokeStatusInfo *info = (PokeStatusInfo *) data;
+
-        g_object_unref (info->self);
-        g_slice_free (PokeStatusInfo, info);
@@ -4168 +4169 @@
-
-                folder = poke_folders->data;
+
+                if (folder == NULL)
+                        goto mycont;
-
-                priv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder);
@@ -4198 +4202 @@
-                                info, tny_camel_folder_poke_status_destroyer);
-                }
-
-                g_object_unref (folder);
-
+
+
+
-                poke_folders = g_list_next (poke_folders);
-                mypoke_folders = poke_folders;

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

@@ -72 +72 @@
-        TnyCamelFolder *folder = NULL;
-
-
+
+
+
+
+
-        while (copy)
-        {
-                TnyFolder *fnd = (TnyFolder*) copy->data;
-                const gchar *name = tny_folder_get_id (fnd);
-
+
+
+
+
-                {
-                        folder = TNY_CAMEL_FOLDER (g_object_ref (G_OBJECT (fnd)));
@@ -88 +95 @@
-        if (!folder) {
-                folder = TNY_CAMEL_FOLDER (_tny_camel_imap_folder_new ());
+                priv->managed_folders = g_list_prepend (priv->managed_folders, folder);
+
+                /* printf ("CREATE: %s\n", full_name); */
+
-                *was_new = TRUE;
-        }
+
+        g_static_rec_mutex_unlock (priv->factory_lock);
-
-        return (TnyFolder *) folder;

trunk/libtinymail-camel/tny-camel-pop-store-account-priv.h

@@ -25 +25 @@
-struct _TnyCamelPopStoreAccountPriv
-{
+        TnyFolder *inbox;
-        GMutex *lock;
-};

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

@@ -95 +95 @@
-{
-        TnyCamelStoreAccountPriv *priv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (self);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                *was_new = TRUE;
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -138 +130 @@
-{
-        TnyCamelPopStoreAccountPriv *priv = TNY_CAMEL_POP_STORE_ACCOUNT_GET_PRIVATE (object);
+
+        if (priv->inbox)
+                g_object_unref (priv->inbox);
-
-        g_mutex_free (priv->lock);
@@ -232 +227 @@
-
-        pop3_store->immediate_delete_after = !enabled;
-
-        
-}
-
@@ -242 +235 @@
-        TnyCamelPopStoreAccountPriv *priv = TNY_CAMEL_POP_STORE_ACCOUNT_GET_PRIVATE (instance);
-
+        priv->inbox = NULL;
-        priv->lock = g_mutex_new ();
-

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -95 +95 @@
-        TnyMsgView *msg_view;
-        guint accounts_reloaded_signal;
-
+, *sync_button
-        guint status_id;
-        gulong mailbox_select_sid;
@@ -1381 +1381 @@
-}
-
+static void
+sync_button_clicked (GtkWidget *button, gpointer user_data)
+{
+        TnyDemouiSummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+
+        if (gtk_tree_selection_get_selected (priv->mailbox_select, &model, &iter))
+        {
+                gint type;
+
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                        &type, -1);
+
+                if (type != TNY_FOLDER_TYPE_ROOT) 
+                { 
+                        TnyFolder *folder;
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                                &folder, -1);
+
+                        if (TNY_IS_FOLDER (folder))
+                                tny_folder_sync_async (folder, TRUE, NULL, NULL, NULL);
+
+                        g_object_unref (folder);
+                }
+
+        }
+}
+
-
-static void 
@@ -1670 +1702 @@
-        priv->online_button = gtk_toggle_button_new_with_label (GO_ONLINE_TXT);
-        priv->poke_button = gtk_button_new_with_label ("Poke status");
+        priv->sync_button = gtk_button_new_with_label ("Sync");
-        priv->current_accounts = NULL;
-
@@ -1677 +1710 @@
-        g_signal_connect (G_OBJECT (priv->poke_button), "clicked", 
-                G_CALLBACK (poke_button_toggled), self);
+
+        g_signal_connect (G_OBJECT (priv->sync_button), "clicked", 
+                G_CALLBACK (sync_button_clicked), self);
-
-#if PLATFORM==1
@@ -1705 +1741 @@
-        gtk_box_pack_start (GTK_BOX (priv->status), priv->online_button, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (priv->status), priv->poke_button, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (priv->status), priv->sync_button, FALSE, FALSE, 0);
-
-        gtk_widget_show (priv->online_button);
-        gtk_widget_show (priv->poke_button);
+        gtk_widget_show (priv->sync_button);
-        gtk_widget_show (priv->status);
-        gtk_widget_show (GTK_WIDGET (vbox));