Replaced modest_toolkit_utils_parent_window by gtk_widget_get_toplevel

diff --git a/src/gtk/modest-platform.c b/src/gtk/modest-platform.c
index 3ec52d4..f492eb6 100644 (file)
--- a/src/gtk/modest-platform.c
+++ b/src/gtk/modest-platform.c
@@ -881,7 +881,7 @@ modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
 {
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
 
-       return modest_platform_run_folder_common_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)), 
+       return modest_platform_run_folder_common_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)), 
                                                         parent_folder,
                                                         _HL("ckdg_ti_rename_folder"),
                                                         _HL("ckdg_fi_rename_name"),

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index fd2e000..2bd5d6d 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -564,11 +564,14 @@ modest_ui_actions_on_accounts (GtkAction *action,
                return;
        } else {
                /* Show the list of accounts */
-               GtkWindow *account_win = GTK_WINDOW (modest_account_view_window_new ());
+               GtkWindow *toplevel, *account_win;
+
+               account_win = GTK_WINDOW (modest_account_view_window_new ());
+               toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win)));
 
                /* The accounts dialog must be modal */
                modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win);
-               modest_utils_show_dialog_and_forget (modest_toolkit_utils_parent_window (GTK_WIDGET (win)), GTK_DIALOG (account_win));
+               modest_utils_show_dialog_and_forget (toplevel, GTK_DIALOG (account_win));
        }
 }
 
@@ -2901,7 +2904,7 @@ do_create_folder_cb (ModestMailOperation *mail_op,
                           full memory condition */
                        modest_platform_information_banner ((GtkWidget *) source_win, NULL,
                                                            _("mail_in_ui_folder_create_error"));
-                       do_create_folder (modest_toolkit_utils_parent_window (GTK_WIDGET (source_win)),
+                       do_create_folder ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (source_win)),
                                          parent_folder, (const gchar *) suggested_name);
                }
 
@@ -4133,8 +4136,9 @@ modest_ui_actions_on_details (GtkAction *action,
                header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
                folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
                if (folder) {
-                       modest_platform_run_folder_details_dialog (GTK_WINDOW (win),
-                                                                  folder);
+                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+
+                       modest_platform_run_folder_details_dialog (toplevel, folder);
                        g_object_unref (folder);
                }
        }
@@ -5090,9 +5094,11 @@ modest_ui_actions_on_settings (GtkAction *action,
                               ModestWindow *win)
 {
        GtkWidget *dialog;
+       GtkWindow *toplevel;
 
        dialog = modest_platform_get_global_settings_dialog ();
-       gtk_window_set_transient_for (GTK_WINDOW (dialog), modest_toolkit_utils_parent_window (GTK_WIDGET (win)));
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (win));
+       gtk_window_set_transient_for (GTK_WINDOW (dialog), toplevel);
        gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
        gtk_widget_show_all (dialog);
 

diff --git a/src/modest-utils.c b/src/modest-utils.c
index d611f3e..0d17695 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -683,7 +683,7 @@ modest_utils_run_sort_dialog (ModestWindow *parent_window,
        GtkWidget *dialog = NULL;
 
        /* Build dialog */
-       dialog = modest_platform_create_sort_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)));
+       dialog = modest_platform_create_sort_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)));
        if (dialog == NULL)
                return;
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),

diff --git a/src/widgets/modest-toolkit-utils.c b/src/widgets/modest-toolkit-utils.c
index 116babe..36c262a 100644 (file)
--- a/src/widgets/modest-toolkit-utils.c
+++ b/src/widgets/modest-toolkit-utils.c
@@ -438,20 +438,3 @@ modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, g
        return FALSE;
 #endif
 }
-
-GtkWindow *
-modest_toolkit_utils_parent_window (GtkWidget *window)
-{
-#ifdef MODEST_TOOLKIT_GTK
-       if (MODEST_IS_WINDOW (window)) {
-               ModestWindowMgr *mgr;
-
-               mgr = modest_runtime_get_window_mgr ();
-               return GTK_WINDOW (modest_gtk_window_mgr_get_shell (MODEST_GTK_WINDOW_MGR (mgr)));
-       } else {
-               return GTK_WINDOW (window);
-       }
-#else
-       return GTK_WINDOW (window);
-#endif
-}

diff --git a/src/widgets/modest-toolkit-utils.h b/src/widgets/modest-toolkit-utils.h
index 8a20b67..25c7e13 100644 (file)
--- a/src/widgets/modest-toolkit-utils.h
+++ b/src/widgets/modest-toolkit-utils.h
@@ -85,8 +85,4 @@ GtkWidget *modest_toolkit_utils_create_group_box (const gchar *label, GtkWidget
 
 gboolean   modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs);
 
-GtkWindow *modest_toolkit_utils_parent_window (GtkWidget *window);
-
-
-
 #endif /*__MODEST_TOOLKIT_UTILS_H__*/