2007-08-14 Murray Cumming <murrayc@murrayc.com>

* src/modest-tny-account-store.c: (modest_tny_account_store_new):
Renabled the call to add_mmc_account() because I do not believe
it could be the cause of the mentioned hang (in scratchbox, where
there is no memory card), and because I have tested that it works
on the device.

pmo-trunk-r2989

diff --git a/ChangeLog2 b/ChangeLog2
index e160f7e..a7e1024 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,6 +1,14 @@
 2007-08-14  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-tny-account-store.c: (modest_tny_account_store_new):
+       Renabled the call to add_mmc_account() because I do not believe 
+       it could be the cause of the mentioned hang (in scratchbox, where 
+       there is no memory card), and because I have tested that it works 
+       on the device.
+       
+2007-08-14  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/modest-tny-account-store.c: (modest_tny_account_store_new):
        Comment out part of the last commit because it apparently causes 
        a hang.
 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 4ec859e..18f08ad 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -910,11 +910,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
                MODEST_MCC1_VOLUMEPATH);
        if (volume) {
                /* It is mounted: */
-               
-               /* TODO: Reneable this. Apaprently it causes a hang: */
-               #if 0
                add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); 
-               #endif
                gnome_vfs_volume_unref(volume);
        }