2007-06-13 Murray Cumming <murrayc@murrayc.com>

* src/modest-init.c: (modest_init_init_core),
(modest_init_local_folders): Fixed compilation errors.

pmo-trunk-r2210

diff --git a/ChangeLog2 b/ChangeLog2
index 8f761ae..c31fa8f 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,10 @@
 2007-06-13  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-init.c: (modest_init_init_core),
+       (modest_init_local_folders): Fixed compilation errors.
+
+2007-06-13  Murray Cumming  <murrayc@murrayc.com>
+
        * libmodest-dbus-client/libmodest-dbus-client-1.0.pc.in:
        Remove unnecessary lib/include, though it is good in principle when needed.
        

diff --git a/src/modest-init.c b/src/modest-init.c
index b7169ca..308c582 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -168,7 +168,7 @@ modest_init_init_core (void)
 
        init_default_settings (modest_runtime_get_conf ());
        
-       if (!modest_init_local_folders()) {
+       if (!modest_init_local_folders(NULL)) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init local folders\n");
                return FALSE;
@@ -351,7 +351,7 @@ modest_init_local_folders (const gchar* location_filepath)
        if (location_filepath) {
                /* For instance, for memory card, just create the top-level .modest folder: */
                if (g_mkdir_with_parents (maildir_path, 0755) < 0) {
-                       g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, dir);
+                       g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath);
                        g_free (maildir_path);
                        return FALSE;
                }

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 70df25f..be61cd0 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -450,8 +450,7 @@ TnyAccount*
 modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
 {
        /* Make sure that the directories exist: */
-       if (location_filepath == NULL) /* Only for the special local folders account, not for the memory card. */
-               modest_init_local_folders ();
+       modest_init_local_folders (location_filepath);
 
        TnyStoreAccount *tny_account;
        CamelURL *url;