X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=83ef31eea453a10c20de9ba08502c657b6c5963c;hp=6677eab006055aced818d13e7f53e0699c002546;hb=3b5dc6fc08a4bb09b660ce6c777edc2e35fdcdfa;hpb=ab5e47a8570068f507a26a148a0dbecbb51c1bab

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 6677eab..83ef31e 100644
--- 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;