* Added a new function to get the folder window

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index b9f1f24..a752915 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3158,7 +3158,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
                                         ModestMsgEditWindow *window)
 {
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
-       g_return_if_fail (GTK_IS_ACTION (action));
 
        modest_msg_edit_window_remove_attachments (window, NULL);
 }
@@ -3332,24 +3331,21 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
 #else
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 #endif
-       
+
        if (parent_folder) {
                /* The parent folder will be freed in the callback */
-               modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window), 
+               modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window),
                                                               TRUE,
                                                               parent_folder,
-                                                              create_folder_performer, 
+                                                              create_folder_performer,
                                                               parent_folder);
        }
-#ifdef MODEST_TOOLKIT_HILDON2
-       g_object_unref (parent_folder);
-#endif
 }
 
-void 
+void
 modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
 {
-       
+
        g_return_if_fail (MODEST_IS_WINDOW(window));
 
        if (MODEST_IS_MAIN_WINDOW (window)) {
@@ -3507,6 +3503,8 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif
+       } else {
+               return FALSE;
        }
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
@@ -3584,6 +3582,10 @@ on_delete_folder_cb (gboolean canceled,
        } else if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
 #endif
+       } else {
+               g_object_unref (G_OBJECT (info->folder));
+               g_free (info);
+               return;
        }
 
        /* Unselect the folder before deleting it to free the headers */
@@ -3625,6 +3627,8 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        } else if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
 #endif
+       } else {
+               return FALSE;
        }
        if (!folder_view)
                return FALSE;
@@ -4794,7 +4798,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
                TnyFolderStore *dst_folder;
 
        case MODEST_GTK_RESPONSE_NEW_FOLDER:
-               modest_ui_actions_create_folder (GTK_WIDGET (dialog), folder_view);
+               modest_ui_actions_create_folder (GTK_WIDGET (parent_win), folder_view);
                return;
        case GTK_RESPONSE_NONE:
        case GTK_RESPONSE_CANCEL: