* modest-mail-operation.c, modest-folder-view.c:

  - s/tny_folder_expunge/tny_folder_sync/

pmo-trunk-r740

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 2e190d8..3bf356e 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -807,7 +807,7 @@ modest_mail_operation_find_trash_folder (ModestMailOperation *self,
        TnyIterator *iter;
        gboolean found;
        /*TnyFolderStoreQuery *query;*/
-       TnyFolder *trash_folder;
+       TnyFolder *trash_folder = NULL;
 
        /* Look for Trash folder */
        folders = TNY_LIST (tny_simple_list_new ());
@@ -898,7 +898,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
                g_object_unref (G_OBJECT (store_account));
        } else {
                tny_folder_remove_msg (folder, header, NULL); /* FIXME */
-               tny_folder_expunge (folder, NULL); /* FIXME */
+               tny_folder_sync(folder, TRUE, NULL); /* FIXME */
        }
 
        /* Free */

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index bc31d32..e6960c9 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -561,7 +561,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       folder, TRUE);
        if (priv->cur_folder)
-               tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */
+               tny_folder_sync (priv->cur_folder, TRUE, NULL); /* FIXME */
        priv->cur_folder = folder;
 
 }