Modified webpage: now tinymail repository is in gitorious.

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 14d9795..d578895 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -37,9 +37,6 @@
 #include <tny-camel-account.h>
 #include <tny-status.h>
 #include <tny-camel-send-queue.h>
-#include <tny-camel-transport-account.h>
-#include <tny-camel-imap-store-account.h>
-#include <tny-camel-pop-store-account.h>
 #include <locale.h>
 #include <modest-defs.h>
 #include "modest-utils.h"
@@ -49,7 +46,6 @@
 #include "modest-text-utils.h"
 #include <modest-local-folder-info.h>
 #include "widgets/modest-header-view.h"
-#include "widgets/modest-main-window.h"
 #include "modest-widget-memory.h"
 #include "widgets/modest-sort-criterium-view.h"
 #include "widgets/modest-header-window.h"
@@ -420,26 +416,13 @@ modest_utils_get_supported_secure_authentication_methods (ModestProtocolType pro
 }
 
 void
-modest_utils_show_dialog_and_forget (GtkWidget *parent_window,
+modest_utils_show_dialog_and_forget (GtkWindow *parent_window,
                                     GtkDialog *dialog)
 {
        g_return_if_fail (GTK_IS_DIALOG(dialog));
 
-#ifdef MODEST_TOOLKIT_GTK
-       if (GTK_IS_WINDOW (parent_window)) {
-               gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-       } else {
-               ModestWindowMgr *window_mgr;
-               GtkWidget *shell;
-
-               window_mgr = modest_runtime_get_window_mgr ();
-               shell  = modest_gtk_window_mgr_get_shell (MODEST_GTK_WINDOW_MGR (window_mgr));
-               gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (shell));
-       }
-#else
        g_return_if_fail (GTK_IS_WINDOW(parent_window));
        gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-#endif
 
        /* Destroy the dialog when it is closed: */
        g_signal_connect_swapped (dialog,
@@ -550,7 +533,7 @@ checked_modest_sort_criterium_view_add_sort_key (ModestSortCriteriumView *view,
 }
 
 static void
-launch_sort_headers_dialog (GtkWindow *parent_window,
+launch_sort_headers_dialog (ModestWindow *parent_window,
                            GtkDialog *dialog)
 {
        ModestHeaderView *header_view = NULL;
@@ -565,6 +548,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        gint attachments_sort_id;
        gint priority_sort_id;
        GtkTreeSortable *sortable;
+       GtkTreeModel *filter;
 
        /* Get header window */
        if (MODEST_IS_HEADER_WINDOW (parent_window)) {
@@ -630,7 +614,8 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
        priority_sort_id = sort_key;
        
-       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+       filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)));
        /* Launch dialogs */
        if (!gtk_tree_sortable_get_sort_column_id (sortable,
                                                   &current_sort_colid, &current_sort_type)) {
@@ -690,17 +675,19 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 }
 
 void
-modest_utils_run_sort_dialog (GtkWindow *parent_window,
+modest_utils_run_sort_dialog (ModestWindow *parent_window,
                              ModestSortDialogType type)
 {
        GtkWidget *dialog = NULL;
+       GtkWindow *toplevel;
 
        /* Build dialog */
-       dialog = modest_platform_create_sort_dialog (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) {
@@ -835,7 +822,7 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self,
                show_char = "' '";
        }
        
-       message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char);
+       message = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, show_char);
        modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
        g_free (message);
 }