Fixes NB#107231, show folder in proper font after moving

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index a684f85..2028960 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1346,13 +1346,11 @@ modest_platform_connect_and_wait (GtkWindow *parent_window,
        g_mutex_unlock (data->mutex);
 
  frees:
-       if (data) {
-               if (g_signal_handler_is_connected (account, data->handler))
-                       g_signal_handler_disconnect (account, data->handler);
-               g_mutex_free (data->mutex);
-               g_main_loop_unref (data->wait_loop);
-               g_slice_free (ConnectAndWaitData, data);
-       }
+       if (g_signal_handler_is_connected (account, data->handler))
+               g_signal_handler_disconnect (account, data->handler);
+       g_mutex_free (data->mutex);
+       g_main_loop_unref (data->wait_loop);
+       g_slice_free (ConnectAndWaitData, data);
 
        conn_status = tny_account_get_connection_status (account);
        return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE;
@@ -2274,7 +2272,7 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
                account = TNY_ACCOUNT (g_object_ref (folder_store));
        }
 
-       if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+       if (account && (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE)) {
                if (!modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) {
                        /* No need to connect a local account */
                        if (callback)
@@ -2519,6 +2517,10 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
        gtk_widget_set_sensitive (back_button, FALSE);
        gtk_widget_set_sensitive (action_button, FALSE);
 
+       /* 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 (FALSE));
+
        gtk_label_set_text (GTK_LABEL (selection_label), "");
        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);
@@ -2528,8 +2530,6 @@ move_to_dialog_show_accounts (GtkWidget *dialog)
        g_object_set (G_OBJECT (folder_view), 
                      "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
                      NULL);
-
-       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
 }
 
 static void
@@ -2553,8 +2553,12 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
        gtk_widget_set_sensitive (back_button, TRUE);
        gtk_widget_set_sensitive (action_button, FALSE);
 
-       g_object_set (G_OBJECT (folder_view), 
-                     "hildon-ui-mode", HILDON_UI_MODE_EDIT, 
+       /* 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);
 
        account = TNY_ACCOUNT (folder_store);
@@ -2595,8 +2599,6 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
        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);
-
-       g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
 }
 
 static void
@@ -2655,9 +2657,7 @@ on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
 
        dialog = (GtkWidget *) user_data;
        showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
-       if (showing_folders) {
-               move_to_dialog_set_selected_folder (dialog, selected);
-       } else {
+       if (!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));
@@ -2667,6 +2667,49 @@ on_move_to_dialog_folder_activated (GtkTreeView       *tree_view,
        }
 }
 
+static void
+on_move_to_dialog_selection_changed (GtkTreeSelection       *selection,
+                                    gpointer           user_data)
+{
+       gboolean showing_folders;
+       GtkWidget *dialog;
+
+       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) {
+                       move_to_dialog_set_selected_folder (dialog, selected);
+                       g_object_unref (selected);
+               }
+       }
+}
+
+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) {
+               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)
+                       gtk_dialog_response  (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+       }
+}
+
 GtkWidget *
 modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                       GtkWidget **folder_view)
@@ -2678,6 +2721,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
        GdkPixbuf *back_pixbuf;
        GtkWidget *top_vbox;
        GtkWidget *action_button;
+       GtkTreeSelection *selection;
 
        /* Create dialog. We cannot use a touch selector because we
           need to use here the folder view widget directly */
@@ -2753,6 +2797,15 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                           G_CALLBACK (on_move_to_dialog_folder_activated),
                           dialog);
 
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*folder_view));
+       g_signal_connect (selection, "changed",
+                         G_CALLBACK (on_move_to_dialog_selection_changed),
+                         dialog);
+
+       g_signal_connect (action_button, "clicked",
+                         G_CALLBACK (on_move_to_dialog_action_clicked),
+                         dialog);
+
        g_signal_connect (back_button, "clicked",
                          G_CALLBACK (on_move_to_dialog_back_clicked),
                          dialog);