Refactor mcc parsing code

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

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 0eca33f..83ef31e 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -37,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>
@@ -102,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;
@@ -110,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;
        }
@@ -792,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;