* Added several gdk_threads_enter/leave stuff in the callbacks of the timeouts becau...

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

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 8f38a5a..e54bb20 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -92,12 +92,13 @@ check_required_files (void)
                return FALSE;
        } else 
                fclose (mcc_file);
-
-       if (access (MODEST_PROVIDERS_DATA_PATH, R_OK) != 0) {
+       
+       if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
+           access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) {
                g_printerr ("modest: cannot find providers data\n");
                return FALSE;
        }
-
+       
        return TRUE;
 }
 
@@ -1827,7 +1828,9 @@ on_conic_device_went_online (TnyMaemoConicDevice *device, const gchar* iap_id, g
        
 void 
 modest_platform_connect_and_perform (GtkWindow *parent_window, 
-                                    TnyAccount *account, ModestConnectedPerformer callback, gpointer user_data)
+                                    TnyAccount *account, 
+                                    ModestConnectedPerformer callback, 
+                                    gpointer user_data)
 {
        gboolean device_online;
        TnyDevice *device;