Use the proper translation for fetching country names and improve mcc detection.
[modest] / src / hildon2 / modest-platform.c
index 161eb44..18db4b3 100644 (file)
@@ -39,6 +39,7 @@
 #include "modest-widget-memory.h"
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
+#include <modest-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <modest-osso-autosave-callbacks.h>
 #include <libosso.h>
@@ -77,6 +78,7 @@
 #include <modest-ui-constants.h>
 #include <modest-selector-picker.h>
 #include <modest-icon-names.h>
+#include <modest-count-stream.h>
 
 #ifdef MODEST_HAVE_MCE
 #include <mce/dbus-names.h>
@@ -132,15 +134,22 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_maemo_open_mcc_mapping_file (NULL);
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
        if (!mcc_file) {
-               g_printerr ("modest: check for mcc file failed\n");
+               g_printerr ("modest: check for mcc file (for LANG) failed\n");
+               return FALSE;
+       } else 
+               fclose (mcc_file);
+       
+       mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
+       if (!mcc_file) {
+               g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
                return FALSE;
        } else 
                fclose (mcc_file);
        
        if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
-           access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) {
+           access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
                g_printerr ("modest: cannot find providers data\n");
                return FALSE;
        }
@@ -630,27 +639,23 @@ on_response (GtkDialog *dialog,
 
        if (response != GTK_RESPONSE_ACCEPT)
                return;
-       
+
        /* Get entry */
        entry = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ENTRY);
        picker = g_object_get_data (G_OBJECT (dialog), COMMON_FOLDER_DIALOG_ACCOUNT_PICKER);
-       
+
        parent = TNY_FOLDER_STORE (user_data);
        new_name = gtk_entry_get_text (GTK_ENTRY (entry));
        exists = FALSE;
-       
-       if (picker != NULL) {
 
+       if (picker != NULL)
                parent = g_object_get_data (G_OBJECT (picker), FOLDER_PICKER_CURRENT_FOLDER);
-       }
 
        /* Look for another folder with the same name */
-       if (modest_tny_folder_has_subfolder_with_name (parent, 
-                                                      new_name,
-                                                      TRUE)) {
+       if (!TNY_IS_MERGE_FOLDER (parent) &&
+           modest_tny_folder_has_subfolder_with_name (parent, new_name, TRUE))
                exists = TRUE;
-       }
-       
+
        if (!exists) {
                if (TNY_IS_ACCOUNT (parent) &&
                    modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent)) &&
@@ -659,9 +664,8 @@ on_response (GtkDialog *dialog,
                        exists = TRUE;
                }
        }
-       
+
        if (exists) {
-               
                /* Show an error */
                hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)), 
                                                NULL, _CS("ckdg_ib_folder_already_exists"));
@@ -671,7 +675,6 @@ on_response (GtkDialog *dialog,
                /* Do not close the dialog */
                g_signal_stop_emission_by_name (dialog, "response");
        }
-
 }
 
 typedef struct _FolderChooserData {
@@ -766,6 +769,61 @@ folder_store_get_display_name (TnyFolderStore *store)
        }
 }
 
+GtkWidget *
+get_image_for_folder_store (TnyFolderStore *store,
+                           gint size)
+{
+       GdkPixbuf *pixbuf;
+       const gchar *icon_name = NULL;
+       GtkWidget *image = NULL;
+
+       if (TNY_IS_ACCOUNT (store)) {
+               if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
+                       icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS;
+               else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store)))
+                       icon_name = MODEST_FOLDER_ICON_MMC;
+               else
+                       icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+       } else {
+               TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
+               if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) {
+                       switch (type) {
+                       case TNY_FOLDER_TYPE_INBOX:
+                               icon_name = MODEST_FOLDER_ICON_INBOX;
+                               break;
+                       default:
+                               icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+                       }
+               } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
+                       switch (type) {
+                       case TNY_FOLDER_TYPE_OUTBOX:
+                               icon_name = MODEST_FOLDER_ICON_OUTBOX;
+                               break;
+                       case TNY_FOLDER_TYPE_DRAFTS:
+                               icon_name = MODEST_FOLDER_ICON_DRAFTS;
+                               break;
+                       case TNY_FOLDER_TYPE_SENT:
+                               icon_name = MODEST_FOLDER_ICON_SENT;
+                               break;
+                       default:
+                               icon_name = MODEST_FOLDER_ICON_NORMAL;
+                       }
+               } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
+                       icon_name = MODEST_FOLDER_ICON_MMC_FOLDER;
+               }
+       }
+
+       /* Set icon */
+       pixbuf = modest_platform_get_icon (icon_name, size);
+
+       if (pixbuf) {
+               image = gtk_image_new_from_pixbuf (pixbuf);
+               g_object_unref (pixbuf);
+       }
+
+       return image;
+}
+
 static void
 folder_picker_set_store (GtkButton *button, TnyFolderStore *store)
 {
@@ -774,61 +832,19 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store)
        if (store == NULL) {
                g_object_set_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, NULL);
        } else {
-               GdkPixbuf *pixbuf;
-               const gchar *icon_name = NULL;
+               GtkWidget *image;
 
-               g_object_ref (store);
-               g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, 
-                                       store, (GDestroyNotify) g_object_unref);
+               g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER,
+                                       g_object_ref (store),
+                                       (GDestroyNotify) g_object_unref);
                name = folder_store_get_display_name (store);
                hildon_button_set_value (HILDON_BUTTON (button), name);
                g_free (name);
 
                /* Select icon */
-               if (TNY_IS_ACCOUNT (store)) {
-                       if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
-                           icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS;
-                       else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store)))
-                               icon_name = MODEST_FOLDER_ICON_MMC;
-                       else
-                               icon_name = MODEST_FOLDER_ICON_ACCOUNT;
-               } else {
-                       TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
-                       if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) {
-                               switch (type) {
-                               case TNY_FOLDER_TYPE_INBOX:
-                                       icon_name = MODEST_FOLDER_ICON_INBOX;
-                                       break;
-                               default:
-                                       icon_name = MODEST_FOLDER_ICON_ACCOUNT;
-                               }
-                       } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
-                               switch (type) {
-                               case TNY_FOLDER_TYPE_OUTBOX:
-                                       icon_name = MODEST_FOLDER_ICON_OUTBOX;
-                                       break;
-                               case TNY_FOLDER_TYPE_DRAFTS:
-                                       icon_name = MODEST_FOLDER_ICON_DRAFTS;
-                                       break;
-                               case TNY_FOLDER_TYPE_SENT:
-                                       icon_name = MODEST_FOLDER_ICON_SENT;
-                                       break;
-                               default:
-                                       icon_name = MODEST_FOLDER_ICON_NORMAL;
-                               }
-                       } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
-                               icon_name = MODEST_FOLDER_ICON_MMC_FOLDER;
-                       }
-               }
-
-               /* Set icon */
-               pixbuf = modest_platform_get_icon (icon_name, MODEST_ICON_SIZE_SMALL);
-
-               if (pixbuf) {
-                       hildon_button_set_image (HILDON_BUTTON (button),
-                                                gtk_image_new_from_pixbuf (pixbuf));
-                       g_object_unref (pixbuf);
-               }
+               image = get_image_for_folder_store (store, MODEST_ICON_SIZE_SMALL);
+               if (image)
+                       hildon_button_set_image (HILDON_BUTTON (button), image);
        }
 }
 
@@ -885,15 +901,17 @@ folder_picker_clicked (GtkButton *button,
        store = folder_chooser_dialog_run (helper->folder_view);
        if (store) {
                const gchar *current_name;
-               gboolean exists;
+               gboolean exists = FALSE;
 
                folder_picker_set_store (GTK_BUTTON (button), store);
 
                /* Update the name of the folder */
                current_name = gtk_entry_get_text (helper->entry);
-               exists = modest_tny_folder_has_subfolder_with_name (store,
-                                                                   current_name,
-                                                                   TRUE);
+
+               if (TNY_IS_FOLDER_STORE (store))
+                       exists = modest_tny_folder_has_subfolder_with_name (store,
+                                                                           current_name,
+                                                                           TRUE);
                if (exists) {
                        gchar *new_name = get_next_folder_name (NULL, store);
                        gtk_entry_set_text (helper->entry, new_name);
@@ -912,9 +930,8 @@ folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 
        hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
 
-       if (suggested) {
+       if (suggested)
                folder_picker_set_store (GTK_BUTTON (button), suggested);
-       }
 
        g_signal_connect (G_OBJECT (button), "clicked",
                          G_CALLBACK (folder_picker_clicked),
@@ -1092,6 +1109,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
        gint result;
        ModestTnyAccountStore *acc_store;
        TnyAccount *account;
+       gboolean do_free = FALSE;
 
        real_suggested_name = get_next_folder_name ((const gchar *) suggested_name,
                                                    suggested_folder);
@@ -1108,9 +1126,11 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
        }
 
        /* If there is not archive folder then fallback to local folders account */
-       if (!suggested_folder)
+       if (!suggested_folder) {
+               do_free = TRUE;
                suggested_folder = (TnyFolderStore *)
                        modest_tny_account_store_get_local_folders_account (acc_store);
+       }
 
        result = modest_platform_run_folder_common_dialog (parent_window,
                                                           suggested_folder,
@@ -1122,6 +1142,9 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                                                           folder_name,
                                                           parent_folder);
 
+       if (do_free)
+               g_object_unref (suggested_folder);
+
        g_free(real_suggested_name);
 
        return result;
@@ -1515,24 +1538,21 @@ modest_platform_push_email_notification(void)
        }
 }
 
-void 
+void
 modest_platform_on_new_headers_received (TnyList *header_list,
                                         gboolean show_visual)
 {
-       g_return_if_fail (TNY_IS_LIST(header_list));
+       g_return_if_fail (TNY_IS_LIST (header_list));
 
-       if (tny_list_get_length(header_list) == 0) {
-               g_warning ("%s: header list is empty", __FUNCTION__);
+       if (tny_list_get_length (header_list) < 1)
                return;
-       }
 
-       if (!show_visual) {
-                modest_platform_push_email_notification ();
-               /* We do a return here to avoid indentation with an else */
+       /* If the window is in the foreground don't do anything */
+       if (hildon_program_get_is_topmost (hildon_program_get_instance ()))
                return;
-       }
 
 #ifdef MODEST_HAVE_HILDON_NOTIFY
+       /* For any other case issue a notification */
        HildonNotification *notification;
        TnyIterator *iter;
        GSList *notifications_list = NULL;
@@ -1613,7 +1633,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
                /* We don't listen for the "closed" signal, because we
                   don't care about if the notification was removed or
                   not to store the list in gconf */
-       
+
                /* Free & carry on */
                g_free (display_address);
                g_free (url);
@@ -1628,7 +1648,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
                              notifications_list, MODEST_CONF_VALUE_INT, NULL);
 
        g_slist_free (notifications_list);
-       
+
 #endif /*MODEST_HAVE_HILDON_NOTIFY*/
 }
 
@@ -1729,10 +1749,10 @@ modest_platform_show_addressbook (GtkWindow *parent_window)
        }
 }
 
-GtkWidget *
-modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+static GtkWidget *
+modest_platform_create_folder_view_full (TnyFolderStoreQuery *query, gboolean do_refresh)
 {
-       GtkWidget *widget = modest_folder_view_new (query);
+       GtkWidget *widget = modest_folder_view_new_full (query, do_refresh);
 
        /* Show one account by default */
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
@@ -1746,6 +1766,12 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        return widget;
 }
 
+GtkWidget *
+modest_platform_create_folder_view (TnyFolderStoreQuery *query)
+{
+       return modest_platform_create_folder_view_full (query, TRUE);
+}
+
 void
 banner_finish (gpointer data, GObject *object)
 {
@@ -2422,14 +2448,90 @@ modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
                                  dialog);
 }
 
+typedef struct _HeaderDetailsGetSizeInfo {
+       GtkWidget *dialog;
+       TnyMimePart *part;
+       guint total;
+} HeaderDetailsGetSizeInfo;
+
+static void 
+header_details_dialog_destroy (gpointer userdata,
+                              GObject *object)
+{
+       HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) userdata;
+
+       info->dialog = NULL;
+}
+
+static gboolean
+idle_get_mime_part_size_cb (gpointer userdata)
+{
+       HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) userdata;
+       gdk_threads_enter ();
+
+       if (info->dialog && GTK_WIDGET_VISIBLE (info->dialog)) {
+               modest_details_dialog_set_message_size (MODEST_DETAILS_DIALOG (info->dialog),
+                                                       info->total);
+       }
+
+       if (info->dialog) {
+               g_object_weak_unref (G_OBJECT (info->dialog), header_details_dialog_destroy, info);
+               info->dialog = NULL;
+       }
+       g_object_unref (info->part);
+       g_slice_free (HeaderDetailsGetSizeInfo, info);
+
+       gdk_threads_leave ();
+
+       return FALSE;
+}
+
+static gpointer
+get_mime_part_size_thread (gpointer thr_user_data)
+{
+       HeaderDetailsGetSizeInfo *info = (HeaderDetailsGetSizeInfo *) thr_user_data;
+       gssize result = 0;
+       TnyStream *count_stream;
+
+       count_stream = modest_count_stream_new ();
+       result = tny_mime_part_decode_to_stream (info->part, count_stream, NULL);
+       info->total = modest_count_stream_get_count(MODEST_COUNT_STREAM (count_stream));
+       if (info->total == 0) {
+               modest_count_stream_reset_count(MODEST_COUNT_STREAM (count_stream));
+               result = tny_mime_part_write_to_stream (info->part, count_stream, NULL);
+               info->total = modest_count_stream_get_count(MODEST_COUNT_STREAM (count_stream));
+       }
+       
+       /* if there was an error, don't set the size (this is pretty uncommon) */
+       if (result < 0) {
+               g_warning ("%s: error while writing mime part to stream\n", __FUNCTION__);
+       }
+       g_idle_add (idle_get_mime_part_size_cb, info);
+
+       return NULL;
+}
+
 void
 modest_platform_run_header_details_dialog (GtkWindow *parent_window,
-                                          TnyHeader *header)
+                                          TnyHeader *header,
+                                          gboolean async_get_size,
+                                          TnyMsg *msg)
 {
        GtkWidget *dialog;
 
        /* Create dialog */
-       dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header);
+       dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header, !async_get_size);
+
+       if (async_get_size && msg && TNY_IS_MSG (msg)) {
+               HeaderDetailsGetSizeInfo *info;
+               info = g_slice_new (HeaderDetailsGetSizeInfo);
+               info->dialog = dialog;
+               info->total = 0;
+               info->part = TNY_MIME_PART (g_object_ref (msg));
+
+               g_object_weak_ref (G_OBJECT (dialog), header_details_dialog_destroy, info);
+               g_thread_create (get_mime_part_size_thread, info, FALSE, NULL);
+       }
 
        /* Run dialog */
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
@@ -2512,6 +2614,69 @@ _modest_platform_play_email_tone (void)
 #define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
 #define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
 #define MOVE_TO_DIALOG_PANNABLE "pannable"
+#define MOVE_TO_FOLDER_SEPARATOR "/"
+
+static void
+move_to_dialog_set_selected_folder_store (GtkWidget *dialog, 
+                                         TnyFolderStore *folder_store)
+{
+       GtkWidget *action_button;
+       GtkWidget *image = NULL;
+       TnyAccount *account;
+       gchar *account_name = NULL, *short_name = NULL;
+
+        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+
+       /* Get account name */
+       if (TNY_IS_FOLDER (folder_store))
+               account = tny_folder_get_account (TNY_FOLDER (folder_store));
+       else
+               account = g_object_ref (folder_store);
+
+       if (modest_tny_account_is_virtual_local_folders (account))
+               account_name = modest_conf_get_string (modest_runtime_get_conf(),
+                                                      MODEST_CONF_DEVICE_NAME, NULL);
+
+       if (!account_name)
+               account_name = g_strdup (tny_account_get_name (account));
+
+       g_object_unref (account);
+
+       /* Set title of button: account or folder name */
+       if (TNY_IS_FOLDER (folder_store))
+               short_name = folder_store_get_display_name (folder_store);
+       else
+               short_name = g_strdup (account_name);
+
+       hildon_button_set_title (HILDON_BUTTON (action_button), short_name);
+
+       /* Set value of button, folder full name */
+       if (TNY_IS_CAMEL_FOLDER (folder_store)) {
+               const gchar *camel_full_name;
+               gchar *last_slash, *full_name;
+
+               camel_full_name = tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store));
+               last_slash = g_strrstr (camel_full_name, "/");
+               if (last_slash) {
+                       gchar *prefix = g_strndup (camel_full_name, last_slash - camel_full_name + 1);
+                       full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR, prefix, short_name, NULL);
+                       g_free (prefix);
+               } else {
+                       full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR,
+                                                short_name,
+                                                NULL);
+               }
+               hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
+               g_free (full_name);
+       }
+       g_free (account_name);
+       g_free (short_name);
+
+       /* Set image for the button */
+       image = get_image_for_folder_store (folder_store, MODEST_ICON_SIZE_BIG);
+       if (image)
+               hildon_button_set_image (HILDON_BUTTON (action_button), image);
+}
 
 static void
 move_to_dialog_show_accounts (GtkWidget *dialog)
@@ -2534,8 +2699,9 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
 
        /* Reset action button */
-       hildon_button_set_title (HILDON_BUTTON (action_button), "");
-       hildon_button_set_value (HILDON_BUTTON (action_button), "");
+       hildon_button_set_title (HILDON_BUTTON (action_button), NULL);
+       hildon_button_set_value (HILDON_BUTTON (action_button), NULL);
+       hildon_button_set_image (HILDON_BUTTON (action_button), NULL);
 
        modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), NULL);
        modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
@@ -2558,7 +2724,6 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
        GtkWidget *folder_view;
        TnyAccount *account;
        const gchar *account_id;
-       gchar *selection_label_text;
        GtkWidget *pannable;
        GtkWidget *action_button;
 
@@ -2582,35 +2747,22 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 
        account = TNY_ACCOUNT (folder_store);
        if (modest_tny_account_is_virtual_local_folders (account)) {
-               gchar *device_name;
                account_id = tny_account_get_id (account);
-               device_name = modest_conf_get_string (modest_runtime_get_conf(),
-                                                     MODEST_CONF_DEVICE_NAME, NULL);
-               if (device_name) {
-                       selection_label_text = g_strconcat (device_name, "/", NULL);
-                       g_free (device_name);
-               } else {
-                       selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
-               }
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
                                               MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
        } else if (modest_tny_account_is_memory_card_account (account)) {
                account_id = tny_account_get_id (account);
-               selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
                                               MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
        } else {
                account_id = tny_account_get_id (account);
-
-               selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
                                               MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
                                               MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
        }
-       hildon_button_set_title (HILDON_BUTTON (action_button), selection_label_text);
-       g_free (selection_label_text);
 
+       move_to_dialog_set_selected_folder_store (dialog, folder_store);
        modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
                                                                     account_id);
 
@@ -2622,23 +2774,6 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 }
 
 static void
-move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store)
-{
-       GtkWidget *action_button;
-
-        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
-
-       hildon_button_set_title (HILDON_BUTTON (action_button),
-                                (TNY_IS_ACCOUNT (folder_store)) ?
-                                tny_account_get_name (TNY_ACCOUNT (folder_store)) :
-                                tny_folder_get_name (TNY_FOLDER (folder_store)));
-
-       if (TNY_IS_CAMEL_FOLDER (folder_store))
-               hildon_button_set_value (HILDON_BUTTON (action_button), 
-                                        tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store)));
-}
-
-static void
 on_move_to_dialog_back_clicked (GtkButton *button,
                                gpointer userdata)
 {
@@ -2686,7 +2821,7 @@ on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
                if (valid)
                        move_to_dialog_show_folders (dialog, selected);
        } else {
-               move_to_dialog_set_selected_folder (dialog, selected);
+               move_to_dialog_set_selected_folder_store (dialog, selected);
        }
 }
 
@@ -2707,7 +2842,7 @@ on_move_to_dialog_selection_changed (GtkTreeSelection *selection,
                selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
                if (selected) {
-                       move_to_dialog_set_selected_folder (dialog, selected);
+                       move_to_dialog_set_selected_folder_store (dialog, selected);
                        g_object_unref (selected);
                }
        }
@@ -2717,22 +2852,31 @@ static void
 on_move_to_dialog_action_clicked (GtkButton *selection,
                                  gpointer   user_data)
 {
-       TnyFolderStore *selected;
        GtkWidget *dialog;
-       GtkWidget *folder_view;
        gboolean showing_folders;
 
        dialog = (GtkWidget *) user_data;
        showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
        if (showing_folders) {
+               TnyFolderStore *selected;
+               GtkWidget *folder_view;
+
                folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
                selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
-               if (selected)
+               if (selected) {
                        gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+                       g_object_unref (selected);
+               }
        }
 }
 
+static void
+move_to_dialog_activity_changed (ModestFolderView *folder_view, gboolean activity, GtkDialog *dialog)
+{
+       hildon_gtk_window_set_progress_indicator (GTK_WINDOW (dialog), activity?1:0);
+}
+
 GtkWidget *
 modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                       GtkWidget **folder_view)
@@ -2760,7 +2904,9 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        top_vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
 
        /* Create folder view */
-       *folder_view = modest_platform_create_folder_view (NULL);
+       *folder_view = modest_platform_create_folder_view_full (NULL, FALSE);
+       g_signal_connect (G_OBJECT (*folder_view), "activity-changed", G_CALLBACK (move_to_dialog_activity_changed),
+                         dialog);
 
        modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view),
                                           MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);