Small fix in folder view filtering

pmo-trunk-r7635

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 83d6d03..06fb754 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -2470,10 +2470,10 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 
        account = TNY_ACCOUNT (folder_store);
        if (modest_tny_account_is_virtual_local_folders (account)) {
-               account_id = NULL;
+               account_id = "";
                selection_label_text = g_strconcat (_("TODO: local folders"), "/", NULL);
        } else {
-               account_id = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+               account_id = tny_account_get_id (account);
 
                selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
        }

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index d4486a6..1cb1465 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1918,7 +1918,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 
        /* If this is a move to dialog, hide Sent, Outbox and Drafts
        folder as no message can be move there according to UI specs */
-       if (!priv->show_non_move) {
+       if (retval && !priv->show_non_move) {
                if (priv->list_to_move && 
                    tny_list_get_length (priv->list_to_move) > 0 &&
                    TNY_IS_FOLDER (instance)) {