Some compilation fixes for Hildon2 code

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index c2df14f..91992a9 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1201,7 +1201,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 ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) 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 2bd5d6d..f0c9d60 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3045,9 +3045,11 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
 
        if (MODEST_IS_FOLDER_WINDOW (window)) {
                GtkWidget *folder_view;
+               GtkWindow *toplevel;
 
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
-               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view, NULL);
+               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+               modest_ui_actions_create_folder (toplevel, folder_view, NULL);
        } else {
                g_assert_not_reached ();
        }
@@ -4260,7 +4262,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 
        case MODEST_GTK_RESPONSE_NEW_FOLDER:
                selected = modest_folder_view_get_selected (folder_view);
-               modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view), selected);
+               modest_ui_actions_create_folder ((GtkWindow *) dialog, GTK_WIDGET (folder_view), selected);
                g_object_unref (selected);
                return;
        case GTK_RESPONSE_NONE:

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 0d17695..fb9952b 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -681,13 +681,15 @@ modest_utils_run_sort_dialog (ModestWindow *parent_window,
                              ModestSortDialogType type)
 {
        GtkWidget *dialog = NULL;
+       GtkWindow *toplevel;
 
        /* Build dialog */
-       dialog = modest_platform_create_sort_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)));
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (parent_window));
+       dialog = modest_platform_create_sort_dialog (toplevel);
        if (dialog == NULL)
                return;
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (dialog), parent_window);
+                                    GTK_WINDOW (dialog), toplevel);
 
        /* Fill sort keys */
        switch (type) {