Add a way to limit the number of chars in value part of from field selector picker.
[modest] / src / hildon2 / modest-platform.c
index a8d881d..6caa2d8 100644 (file)
@@ -43,6 +43,7 @@
 #include <modest-osso-autosave-callbacks.h>
 #include <libosso.h>
 #include <tny-maemo-conic-device.h>
+#include <tny-camel-folder.h>
 #include <tny-simple-list.h>
 #include <tny-merge-folder.h>
 #include <tny-error.h>
@@ -765,6 +766,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)
 {
@@ -773,8 +829,7 @@ 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, 
@@ -784,50 +839,9 @@ folder_picker_set_store (GtkButton *button, TnyFolderStore *store)
                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);
        }
 }
 
@@ -2509,20 +2523,68 @@ _modest_platform_play_email_tone (void)
 #define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view"
 #define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
 #define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
-#define MOVE_TO_DIALOG_SELECTION_LABEL "selection-label"
 #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;
+
+        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)) {
+               hildon_button_set_title (HILDON_BUTTON (action_button), 
+                                        tny_folder_get_name (TNY_FOLDER (folder_store)));
+       } else {
+               hildon_button_set_title (HILDON_BUTTON (action_button), account_name);
+       }
+
+       /* Set value of button, folder full name */
+       if (TNY_IS_CAMEL_FOLDER (folder_store)) {
+               gchar *full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR,
+                                               tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store)),
+                                               NULL);
+               hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
+               g_free (full_name);
+       }
+       g_free (account_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)
 {
-       GtkWidget *selection_label;
        GtkWidget *back_button;
        GtkWidget *folder_view;
        GtkWidget *pannable;
        GtkWidget *action_button;
 
-        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
         back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
         action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
         folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
@@ -2535,7 +2597,11 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
           of filtering won't perform correctly */
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
 
-       gtk_label_set_text (GTK_LABEL (selection_label), "");
+       /* Reset 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);
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
@@ -2543,109 +2609,70 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
                                         MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
        modest_folder_view_unset_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_FOLDERS);
+       modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), 
+                                        MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
+       modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), 
+                                      MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
        hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
-
-       g_object_set (G_OBJECT (folder_view), 
-                     "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
-                     NULL);
 }
 
 static void
 move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 {
-       GtkWidget *selection_label;
        GtkWidget *back_button;
        GtkWidget *folder_view;
        TnyAccount *account;
        const gchar *account_id;
-       gchar *selection_label_text;
        GtkWidget *pannable;
        GtkWidget *action_button;
 
-        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
-        back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
-        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
-        folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
-        pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+        back_button =
+               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+        action_button =
+               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+        folder_view =
+               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+        pannable =
+               GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
 
        gtk_widget_set_sensitive (back_button, TRUE);
-       gtk_widget_set_sensitive (action_button, FALSE);
+       gtk_widget_set_sensitive (action_button, TRUE);
 
        /* Need to set this here, otherwise callbacks called because
           of filtering won't perform correctly */
-       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
-
-       g_object_set (G_OBJECT (folder_view),
-                     "hildon-ui-mode", HILDON_UI_MODE_EDIT,
-                     NULL);
+       g_object_set_data (G_OBJECT (dialog),
+                          MOVE_TO_DIALOG_SHOWING_FOLDERS,
+                          GINT_TO_POINTER (TRUE));
 
        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);
        }
-       gtk_label_set_text (GTK_LABEL (selection_label), 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);
 
        modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), FALSE);
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
+       modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
        modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
        hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
 }
 
 static void
-move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store)
-{
-       GtkWidget *selection_label;
-       GtkWidget *action_button;
-       gchar *folder_name;
-
-        selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
-        action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
-
-       gtk_widget_set_sensitive (action_button, TRUE);
-
-       if (TNY_IS_FOLDER (folder_store)) {
-               folder_name = modest_tny_folder_get_display_name (TNY_FOLDER (folder_store));
-       } else if (TNY_IS_ACCOUNT (folder_store)) {
-               folder_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (folder_store)));
-       } else {
-               folder_name = g_strdup ("");
-       }
-
-       gtk_label_set_text (GTK_LABEL (selection_label), folder_name);
-       g_free (folder_name);
-
-}
-
-static void
 on_move_to_dialog_back_clicked (GtkButton *button,
                                gpointer userdata)
 {
@@ -2656,46 +2683,50 @@ on_move_to_dialog_back_clicked (GtkButton *button,
 }
 
 static void
-on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
+on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
                                     GtkTreePath       *path,
                                     GtkTreeViewColumn *column,
                                     gpointer           user_data)
 {
-       TnyFolderStore *selected;
+       TnyFolderStore *selected = NULL;
        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));
+       showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), 
+                                                             MOVE_TO_DIALOG_SHOWING_FOLDERS));
+
+       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)
+               return;
+
        if (!showing_folders) {
+               gboolean valid = TRUE;
 
-               folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+               if (TNY_IS_ACCOUNT (selected) &&
+                   modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (selected))) {
+                       ModestProtocolType protocol_type;
 
-               selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-               if (selected) {
-                       gboolean valid;
-
-                       valid = TRUE;
-                       if (TNY_IS_ACCOUNT (selected) &&
-                           modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (selected))) {
-                               ModestProtocolType protocol_type;
-                               
-                               protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (selected));
-                               valid  = !modest_protocol_registry_protocol_type_has_tag 
-                                       (modest_runtime_get_protocol_registry (),
-                                        protocol_type,
-                                        MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
-                       }
-                       if (valid)
-                               move_to_dialog_show_folders (dialog, selected);
+                       protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (selected));
+                       valid  = !modest_protocol_registry_protocol_type_has_tag 
+                               (modest_runtime_get_protocol_registry (),
+                                protocol_type,
+                                MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
                }
+               if (valid)
+                       move_to_dialog_show_folders (dialog, selected);
+       } else {
+               move_to_dialog_set_selected_folder_store (dialog, selected);
        }
 }
 
 static void
-on_move_to_dialog_selection_changed (GtkTreeSelection       *selection,
-                                    gpointer           user_data)
+on_move_to_dialog_selection_changed (GtkTreeSelection *selection,
+                                    gpointer          user_data)
 {
        gboolean showing_folders;
        GtkWidget *dialog;
@@ -2710,15 +2741,15 @@ 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);
                }
        }
 }
 
 static void
-on_move_to_dialog_action_clicked (GtkButton       *selection,
-                                 gpointer           user_data)
+on_move_to_dialog_action_clicked (GtkButton *selection,
+                                 gpointer   user_data)
 {
        TnyFolderStore *selected;
        GtkWidget *dialog;
@@ -2743,7 +2774,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        GtkWidget *dialog, *folder_view_container;
        GtkWidget *align;
        GtkWidget *buttons_hbox;
-       GtkWidget *back_button, *selection_label;
+       GtkWidget *back_button;
        GdkPixbuf *back_pixbuf;
        GtkWidget *top_vbox;
        GtkWidget *action_button;
@@ -2779,11 +2810,10 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf));
                g_object_unref (back_pixbuf);
        }
-       selection_label = gtk_label_new ("");
-       gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5);
 
-       action_button = gtk_button_new ();
-       gtk_container_add (GTK_CONTAINER (action_button), selection_label);
+       action_button = hildon_button_new (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+                                          HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+       gtk_button_set_alignment (GTK_BUTTON (action_button), 0.0, 0.5);
 
        gtk_box_pack_start (GTK_BOX (buttons_hbox), back_button, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (buttons_hbox), action_button, TRUE, TRUE, 0);
@@ -2807,7 +2837,6 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        gtk_widget_show (top_vbox);
        gtk_widget_show (*folder_view);
        gtk_widget_show_all (back_button);
-       gtk_widget_show (selection_label);
        gtk_widget_show (action_button);
        gtk_widget_show (buttons_hbox);
        gtk_widget_show (dialog);
@@ -2815,13 +2844,12 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
-       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL, selection_label);
        g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
 
         /* Simulate the behaviour of a HildonPickerDialog by emitting
           a response when a folder is selected */
         g_signal_connect (*folder_view, "row-activated",
-                          G_CALLBACK (on_move_to_dialog_folder_activated),
+                          G_CALLBACK (on_move_to_dialog_row_activated),
                           dialog);
 
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*folder_view));