Changeset 1988

Timestamp:

05/17/07 01:05:50

Author:

pvanhoof

Message:

Bugfixes

Files:

• trunk/libtinymail-camel/tny-camel-folder.c (modified) (9 diffs)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (4 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (4 diffs)

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

@@ -94 +94 @@
-        {
-                TnyFolderStoreObserver *observer = TNY_FOLDER_STORE_OBSERVER (tny_iterator_get_current (iter));
+
-                tny_folder_store_observer_update (observer, change);
-                g_object_unref (G_OBJECT (observer));
@@ -1551 +1552 @@
-        TnyStoreAccount *acc_to, *acc_from;
-        TnyCamelFolderPriv *fpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder);
-        TnyCamelFolderPriv *tpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (into);
-        TnyList *headers;
-
@@ -1557 +1557 @@
-
-        g_static_rec_mutex_lock (fpriv->folder_lock);
-        g_static_rec_mutex_lock (tpriv->folder_lock);
-
-        load_folder_no_lock (fpriv);
-        load_folder_no_lock (tpriv);
-
-        retval = tny_folder_store_create_folder (into, new_name, &nerr);
@@ -1569 +1567 @@
-        }
-
-
-adds = g_list_append (adds, cpy_event_new (TNY_FOLDER_STORE (into), retval));
+/* 
+ * adds = g_list_append (adds, cpy_event_new (TNY_FOLDER_STORE (into), retval)); */
-
-        if (TNY_IS_FOLDER_STORE (folder))
@@ -1619 +1617 @@
-        }
-
-        a_store = tny_folder_get_folder_store (folder);
-        tny_debug ("recurse_copy: prepending to rems: %s\n", tny_folder_get_name (folder));
-        rems = g_list_append (rems, cpy_event_new (a_store, folder));
-        g_object_unref (a_store);
-
-        headers = tny_simple_list_new ();
-        tny_folder_get_headers (folder, headers, TRUE, &nerr);
@@ -1649 +1642 @@
-        g_object_unref (acc_to);
-
+        if (del)
+        {
+                a_store = tny_folder_get_folder_store (folder);
+                /* tny_debug ("recurse_copy: prepending to rems: %s\n", tny_folder_get_name (folder));
+                rems = g_list_append (rems, cpy_event_new (a_store, folder)); */
+                tny_folder_store_remove_folder (a_store, folder, &nerr);
+                g_object_unref (a_store);
+        }
-
-exception:
@@ -1655 +1656 @@
-                g_propagate_error (err, nerr);
-
-        g_static_rec_mutex_unlock (tpriv->folder_lock);
-        g_static_rec_mutex_unlock (fpriv->folder_lock);
-
@@ -1836 +1836 @@
-                        rems = recurse_evt (self, a_store,
-                                rems, g_list_prepend, TRUE);
-                        
-
-                        /* This does a g_rename on the mmap()ed file! */
@@ -1900 +1899 @@
-                        g_propagate_error (err, nerr);
-                        g_error_free (nerr);
+                } else if (del) {
+                        TnyFolderStore *from = tny_folder_get_folder_store (self);
+                        tny_folder_store_remove_folder (from, self, &nerr);
+                        g_object_unref (from);
+                        if (nerr != NULL) {
+                                g_propagate_error (err, nerr);
+                                g_error_free (nerr);
+                        }
-                }
-

trunk/libtinymail/tny-folder.c

@@ -296 +296 @@
- * newly created folder in @into, which will carry the name @new_name.
- *
+ * Very important note: 
+ * When you are moving @self to @into by setting @del to true, you MUST make 
+ * sure that @self is not used anymore. For example if you have gotten its 
+ * headers using tny_folder_get_headers, you need to get rid of those first.
+ * In case you used a default component like the TnyGtkHeaderListModel or 
+ * TnyGtkHeaderListTree as TnyList for storing the headers in, you can easily
+ * get rid if your headers by setting the model of the GtkTreeView to an empty
+ * one. You MUST NOT try to keep using it further (as the original folder, its 
+ * memory caches and it's offline on-disk cache will have been removed
+ * permanently behind your back). Especially the memory caches will get you in
+ * severe problems, like segmentation errors when trying to access the now 
+ * invalid TnyHeader's properties. This is a design decision and can't be fixed
+ * (it's not a bug): a removed folder is permanently destroyed. Moving a folder
+ * is the same as removing it and creating a new one.
+ * 
- * Implementors: The return value must be the new folder in @into carrying the 
- * name @new_name. Invoking the tny_folder_get_folder_store API on the return 

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

@@ -707 +707 @@
-                gdk_threads_leave ();
-        }
+        return FALSE;
+}
+
+static void 
+folder_obsr_update_idle_destroy (gpointer user_data)
+{
+        FolObsUpInfo *info = user_data;
+        TnyFolderObserver *self = info->self;
+        TnyFolderChange *change = info->change;
-
-        g_object_unref (self);
-        g_object_unref (change);
-
-        g_slice_free (FolObsUpInfo, info);
-
-        return FALSE;
-}
-
@@ -723 +729 @@
-        info->change = TNY_FOLDER_CHANGE (g_object_ref (change));
-
-
+
+
+
-
-        return;
@@ -815 +823 @@
-
-
+        return FALSE;
+}
+
+static void
+folder_store_obsr_update_idle_destroy (gpointer user_data)
+{
+        FolStObsUpInfo *info = user_data;
+        TnyFolderObserver *self = info->self;
+        TnyFolderStoreChange *change = info->change;
+
-        g_object_unref (self);
-        g_object_unref (change);
-
-        g_slice_free (FolStObsUpInfo, info);
-
-        return FALSE;
-}
-
@@ -830 +846 @@
-        info->change = TNY_FOLDER_STORE_CHANGE (g_object_ref (change));
-
-
+
+
+
-
-        return;

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

@@ -167 +167 @@
-
-static void 
-
-
-
-
-
-
+
+
-        g_mutex_lock (priv->monitor_lock);
-        {
@@ -185 +181 @@
-        g_mutex_unlock (priv->monitor_lock);
-
+
+        /* Clear the header_view by giving it an empty model */
+        if (G_UNLIKELY (!empty_model))
+                empty_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
+        set_header_view_model (GTK_TREE_VIEW (priv->header_view), empty_model);
+
+        tny_msg_view_clear (priv->msg_view);
+}
+
+static void 
+reload_accounts (TnyDemouiSummaryViewPriv *priv)
+{
+        TnyAccountStore *account_store = priv->account_store;
+        GtkTreeModel *sortable, *maccounts, *mailbox_model;
+        TnyFolderStoreQuery *query;
+
+
-        /* Show only subscribed folders */
-        query = tny_folder_store_query_new ();
@@ -204 +217 @@
-        maccounts = tny_gtk_account_list_model_new ();
-
-
-
-
-
-
-
+
+
-
-        if (priv->current_accounts)
@@ -856 +865 @@
-                                        GError *err = NULL;
-                                        const gchar *newname = gtk_entry_get_text (GTK_ENTRY (entry));
-
-
+
+
+
+
+
+
+
-
-                                        if (err != NULL)