Changeset 1987

Timestamp:

05/17/07 00:00:48

Author:

pvanhoof

Message:

Bugfixes

Files:

• trunk/libtinymail-camel/tny-camel-folder.c (modified) (6 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (1 diff)

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

@@ -1569 +1569 @@
-        }
-
+        tny_debug ("recurse_copy: adding to adds: %s\n", tny_folder_get_name (retval));
-        adds = g_list_append (adds, cpy_event_new (TNY_FOLDER_STORE (into), retval));
-
@@ -1619 +1620 @@
-
-        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);
@@ -1749 +1751 @@
-                                notify_folder_store_observers_about (evt->str, change);
-
+                        tny_debug ("tny_folder_copy: observers notify folder-del %s\n", 
+                                tny_folder_get_name (evt->fol));
+
-                        g_object_unref (G_OBJECT (change));
-                }
-
-                tny_debug ("tny_folder_copy: observers notify folder-del %s\n", 
-                        tny_folder_get_name (evt->fol));
-
-                cpy_event_free (evt);
@@ -1844 +1846 @@
-
-                                gboolean was_new=FALSE;
-                                adds = recurse_evt (self, TNY_FOLDER_STORE (into), 
-                                        adds, g_list_append, FALSE);
-
-                                retval = tny_camel_store_account_factor_folder 
-                                        (TNY_CAMEL_STORE_ACCOUNT (a), to, &was_new);
@@ -1866 +1865 @@
-                                                succeeded = FALSE; tried=TRUE;
-                                        }
-
-                                        if (succeeded)
-                                                _tny_camel_folder_set_folder_info (TNY_FOLDER_STORE (a), 
-                                                        TNY_CAMEL_FOLDER (retval), iter);
-                                }
+
+                                if (succeeded)
+                                        adds = recurse_evt (retval, TNY_FOLDER_STORE (into), 
+                                                adds, g_list_append, FALSE);
-
-
@@ -1890 +1892 @@
-        {
-                CpyRecRet *cpyr;
+
-                tny_debug ("tny_folder_copy: recurse_copy\n");
+
-                cpyr = recurse_copy (self, into, new_name, del, &nerr, adds, rems);
+
-                if (nerr != NULL) {
-                        g_propagate_error (err, nerr);
-                        g_error_free (nerr);
-                }
+
-                retval = cpyr->created;
-                adds = cpyr->adds;
-                rems = cpyr->rems;
+
-                g_slice_free (CpyRecRet, cpyr);
-        }

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

@@ -1151 +1151 @@
-        menu = gtk_menu_new ();
-
-
+or Copy 
-        mcreate = gtk_menu_item_new_with_label (_("Create folder"));
-        mdelete = gtk_menu_item_new_with_label (_("Delete folder"));