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

* src/modest-tny-account-store.c: (modest_tny_account_store_new):
Commented out the MMC code again because it mistakenly detects
the card even when it isn't inserted.

pmo-trunk-r2992

diff --git a/ChangeLog2 b/ChangeLog2
index a7e1024..a04931c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,6 +1,12 @@
 2007-08-14  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-tny-account-store.c: (modest_tny_account_store_new):
 2007-08-14  Murray Cumming  <murrayc@murrayc.com>
 
        * src/modest-tny-account-store.c: (modest_tny_account_store_new):

+       Commented out the MMC code again because it mistakenly detects 
+       the card even when it isn't inserted.
+
+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 
        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 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 18f08ad..566815c 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -909,8 +909,13 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
        GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, 
                MODEST_MCC1_VOLUMEPATH);
        if (volume) {
        GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, 
                MODEST_MCC1_VOLUMEPATH);
        if (volume) {

+               printf ("%s: gnome_vfs_volume_monitor_get_volume_for_path(%s) returned something.\n", 
+                       __FUNCTION__, MODEST_MCC1_VOLUMEPATH);
+               #if 0 /* Commented out because gnome_vfs_volume_monitor_get_volume_for_path() seems 
+                       to report it as mounted even when the card is not inserted. */

                /* It is mounted: */
                add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); 
                /* It is mounted: */
                add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); 

+               #endif

                gnome_vfs_volume_unref(volume);
        }
        
                gnome_vfs_volume_unref(volume);
        }