X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fmodest-platform.c;h=83ef31eea453a10c20de9ba08502c657b6c5963c;hb=3b5dc6fc08a4bb09b660ce6c777edc2e35fdcdfa;hp=119667e08563d71961ad0291dcfa97a88b75d747;hpb=9b0c9cd11adb0b796d16d2ed109e9df34cb5ed6d;p=modest diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 119667e..83ef31e 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include "modest-widget-memory.h" #include +#include #include #include #include @@ -43,6 +45,8 @@ #include #include #include +#include +#include #include #include #include @@ -99,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; @@ -107,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; } @@ -789,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; @@ -2112,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)