Fixes NB#117330, allow numeric characters in providers picker

[modest] / src / maemo / modest-platform.c

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 1842f34..c56fbdf 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -29,6 +29,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
+#include <modest-defs.h>
 #include <modest-platform.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
@@ -36,6 +37,7 @@
 #include "maemo/modest-maemo-global-settings-dialog.h"
 #include "modest-widget-memory.h"
 #include <modest-hildon-includes.h>
+#include <modest-utils.h>
 #include <modest-maemo-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
@@ -101,7 +103,7 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_maemo_open_mcc_mapping_file ();
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
        if (!mcc_file) {
                g_printerr ("modest: check for mcc file failed\n");
                return FALSE;
@@ -109,7 +111,7 @@ check_required_files (void)
                fclose (mcc_file);
        
        if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
-           access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) {
+           access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
                g_printerr ("modest: cannot find providers data\n");
                return FALSE;
        }
@@ -791,7 +793,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                g_free(real_suggested_name);
 
        if (parent_folder != NULL) {
-               parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL;
+               *parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL;
        }
 
        return result;
@@ -2114,7 +2116,7 @@ modest_platform_check_memory_low (ModestWindow *win,
        if (win && lowmem && visuals)
                modest_platform_run_information_dialog (
                        GTK_WINDOW(win),
-                       dgettext("ke-recv","memr_ib_operation_disabled"),
+                       _KR("memr_ib_operation_disabled"),
                        TRUE);
 
        if (lowmem)
@@ -2146,12 +2148,14 @@ modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
 
 void
 modest_platform_run_header_details_dialog (GtkWindow *parent_window,
-                                          TnyHeader *header)
+                                          TnyHeader *header,
+                                          gboolean async_get_size,
+                                          TnyMsg *msg)
 {
        GtkWidget *dialog;
        
        /* Create dialog */
-       dialog = modest_details_dialog_new_with_header (parent_window, header);
+       dialog = modest_details_dialog_new_with_header (parent_window, header, TRUE);
 
        /* Run dialog */
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),