Replace hildon pannable area with modest scrollable in msg view window

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 1f09385..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) 
@@ -865,8 +866,11 @@ effective_mcc (gint mcc)
 {
        switch (mcc) {
        case 405: return 404; /* india */
-       case 441: return 440; /* japan */       
+       case 441: return 440; /* japan */
+       case 348: /* NOTE: see below */
        case 235: return 234; /* united kingdom */
+       case 289: return 282; /* georgia */
+       case 549: /* NOTE: see below */
        case 311:
        case 312:
        case 313:
@@ -875,6 +879,9 @@ effective_mcc (gint mcc)
        case 316: return 310; /* united states */
        default:  return mcc;
        }
+       /* NOTE: 348 for UK and 549 for US are not correct, but we do
+          a workaround here as changing operator-wizard package is
+          more difficult */
 }
 
 /* each line is of the form: