Removed MainWindow dependency from widgets

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index eaa4455..b2bdaa3 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -551,20 +551,21 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        gint attachments_sort_id;
        gint priority_sort_id;
        GtkTreeSortable *sortable;
-       
+
        /* Get header window */
+#ifndef MODEST_TOOLKIT_HILDON2
        if (MODEST_IS_MAIN_WINDOW (parent_window)) {
                header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_window),
                                                                                      MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
-#ifdef MODEST_TOOLKIT_HILDON2
-       } else if (MODEST_IS_HEADER_WINDOW (parent_window)) {
+       }
+#else
+       if (MODEST_IS_HEADER_WINDOW (parent_window)) {
                header_view = MODEST_HEADER_VIEW (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (parent_window)));
-#endif
-
        }
+#endif
        if (!header_view)
                return;
-       
+
        /* Add sorting keys */
        cols = modest_header_view_get_columns (header_view);
        if (cols == NULL)