Changeset 1654

Timestamp:

02/18/07 15:27:42

Author:

pvanhoof

Message:

Various fixes

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-02-18  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Various fixes for the folder create, rename and delete functionality
+
-2007-02-16  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -2073 +2073 @@
-                if ((*ccfoln == '/') && (strrchr (ccfoln, '/') == ccfoln))
-                {
+                        CamelException subex = CAMEL_EXCEPTION_INITIALISER;
+
+                        if (camel_store_supports_subscriptions (store))
+                                camel_store_subscribe_folder (store, cfolname, &subex);
+
-                        camel_store_delete_folder (store, cfolname, &ex);
-
@@ -2083 +2088 @@
-                        } else 
-                        {
+                                if (camel_store_supports_subscriptions (store))
+                                        camel_store_unsubscribe_folder (store, cfolname, &subex);
+
-                                changed = TRUE;
-                                g_free (cpriv->folder_name); 
@@ -2145 +2153 @@
-        TnyFolder *folder; CamelFolderInfo *info;
-        TnyFolderStoreChange *change;
+        CamelException subex = CAMEL_EXCEPTION_INITIALISER;
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err, 
@@ -2194 +2203 @@
-                return NULL;
-        }
+
+        g_assert (info != NULL);
+
+        if (camel_store_supports_subscriptions (store))
+                camel_store_subscribe_folder (store, info->full_name, &subex);
-
-        folder = _tny_camel_folder_new ();

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

@@ -389 +389 @@
-        TnyCamelFolderPriv *cpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (cfol);
-        CamelStore *store;
-
+
+
-        g_assert (TNY_IS_CAMEL_FOLDER (folder));
-
@@ -425 +426 @@
-        g_assert (cpriv->folder_name != NULL);
-
-
-
-
-
-
+
+
-
-        camel_store_delete_folder (store, cpriv->folder_name, &ex);
-
+
-        if (camel_exception_is_set (&ex)) 
-        {
@@ -441 +439 @@
-        } else 
-        {
-
+
+
+
+
-                change = tny_folder_store_change_new (self);
-                tny_folder_store_change_add_removed_folder (change, folder);
-                notify_folder_store_observers_about (self, change);
-       
+
-        }
-
@@ -472 +473 @@
-        TnyFolder *folder; CamelFolderInfo *info; CamelStore *store;
-        TnyFolderStoreChange *change;
+        CamelException subex = CAMEL_EXCEPTION_INITIALISER;
-
-        if (!_tny_session_check_operation (apriv->session, err, 
@@ -535 +537 @@
-
-        g_assert (info != NULL);
+
+        if (camel_store_supports_subscriptions (store))
+                camel_store_subscribe_folder (store, info->full_name, &subex);
-
-        folder = _tny_camel_folder_new ();

trunk/libtinymail/tny-folder-store.c

@@ -107 +107 @@
- * @err: a #GError object or NULL
- *
-The value returned is the newly created folder
-
+If not NULL, the value returned is the newly 
+created folder 
- *
- * Example:
@@ -115 +115 @@
- * TnyFolder *createfol;
- * createfol = tny_folder_store_create_folder (store, "Test", NULL);
-
+if (createfol) 
- * </programlisting></informalexample>
- * 
-
+ or NULL in case of failure
- *
- **/

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

@@ -70 +70 @@
-                gtk_tree_store_append (model, tree_iter, hlrp->parent_tree_iter);
-
+                /* This adds a reference count to folder too. When it gets removed, that
+                   reference count is decreased automatically by the gtktreestore infra-
+                   structure. */
+
-                gtk_tree_store_set (model, tree_iter,
-                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
@@ -134 +138 @@
-                me->store_observables = g_list_prepend (me->store_observables, folder);
-
+                /* This adds a reference count to folder too. When it gets removed, that
+                   reference count is decreased automatically by the gtktreestore infra-
+                   structure. */
+
-                gtk_tree_store_set (model, &tree_iter,
-                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
@@ -210 +218 @@
-                func (model, name_iter, NULL);
-
+        /* This adds a reference count to folder_store too. When it gets removed,
+           that reference count is decreased automatically by the gtktreestore
+           infrastructure. */
+
-        gtk_tree_store_set (model, name_iter,
-                TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, root_name,
@@ -484 +496 @@
-                if (citem == item)
-                {
+                        /* This removes a reference count */
-                        gtk_tree_store_remove (GTK_TREE_STORE (me), &iter);
-                        g_object_unref (G_OBJECT (item));
@@ -501 +514 @@
-        TnyGtkFolderStoreTreeModel *copy = g_object_new (TNY_TYPE_GTK_FOLDER_STORE_TREE_MODEL, NULL);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        g_mutex_lock (me->iterator_lock);
@@ -533 +545 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-        gint type;
@@ -583 +580 @@
-
-        g_object_unref (G_OBJECT (changed_folder));
-
-
-
-
-
+
+
+
+
+
+
+
-{
-        gint type;
@@ -619 +618 @@
-
-                                gtk_tree_store_append (GTK_TREE_STORE (model), &newiter, iter);
+
+                                /* This adds a reference count to folder_store too. When it gets 
+                                   removed, that reference count is decreased automatically by 
+                                   the gtktreestore infrastructure. */
-
-                                gtk_tree_store_set (GTK_TREE_STORE (model), &newiter,
@@ -646 +649 @@
-
-        g_object_unref (G_OBJECT (parentstore));
-
-
-
-
-
-
+
+
+
+
+
+
+
-{
-        gint type;
-
-
+
-
-        gtk_tree_model_get (model, iter, 
@@ -663 +666 @@
-        if (type != TNY_FOLDER_TYPE_ROOT) 
-        {
-TnyFolderStore
+GObject
-
-                gtk_tree_model_get (model, iter, 
@@ -669 +672 @@
-                        &fol, -1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                g_object_unref (G_OBJECT (fol));
-        }
-
-g_object_unref (G_OBJECT (parentstore))
+return FALSE
-}
-
@@ -729 +691 @@
-                changed & TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT)
-        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void
@@ -744 +747 @@
-        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

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

@@ -869 +869 @@
-                                        const gchar *newname = gtk_entry_get_text (GTK_ENTRY (entry));
-
-
+
+
+
+
-
-                                        if (err != NULL)