Fixed a reference leak

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

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 686ab37..dea33a8 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1739,10 +1739,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),
@@ -1756,6 +1756,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)
 {
@@ -2836,22 +2842,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)
@@ -2879,7 +2894,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);