2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2

[modest] / src / modest-tny-account.c

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 0db9025..10e526d 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -30,6 +30,7 @@
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-runtime.h>
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
@@ -41,7 +42,11 @@
 #include <tny-camel-pop-store-account.h>
 #include <tny-folder-stats.h>
 #include <string.h>
-
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-file-system-info.h>
+#else
+#include <hildon/hildon-file-system-info.h>
+#endif
 
 TnyFolder *
 modest_tny_account_get_special_folder (TnyAccount *account,
@@ -401,25 +406,30 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
        return tny_account;
 }
 
-#if 0
+/* TODO: Notify the treemodel somehow that the display name 
+ * is now available. We should probably request this from the cell_data_func 
+ * so we can provide a treerowreference. */
 static void 
 on_modest_file_system_info(HildonFileSystemInfoHandle *handle,
                            HildonFileSystemInfo *info,
                            const GError *error, gpointer data)
 {
-       if (info) {
-               printf("DEBUG: %s: display name=%s\n", __FUNCTION__, 
-                       hildon_file_system_info_get_display_name(info));
+       TnyAccount *account = TNY_ACCOUNT (data);
+       
+       if (error) {
+               printf ("  DEBUG: %s: error=%s\n", __FUNCTION__, error->message);
        }
-       else {
-               printf("DEBUG: %s: info is NULL.\n", __FUNCTION__);
+       
+       const gchar *display_name = NULL;
+       if (!error && info) {
+               display_name = hildon_file_system_info_get_display_name(info);
        }
        
-       if (error) {
-               printf ("  DEBUG: error=%s\n", error->message);
+       if (display_name) {
+               /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__,  display_name); */
+               tny_account_set_name (account, display_name);
        }
 }
-#endif
 
 
 TnyAccount*
@@ -434,9 +444,19 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 
        g_return_val_if_fail (account_mgr, NULL);
        
-       tny_account = tny_camel_store_account_new ();
+       if (!location_filepath) {
+               /* A NULL filepath means that this is the special local-folders maildir 
+                * account: */
+               tny_account = TNY_STORE_ACCOUNT (modest_tny_local_folders_account_new ());
+       }
+       else {
+               /* Else, for instance, a per-account outbox maildir account: */
+               tny_account = TNY_STORE_ACCOUNT (tny_camel_store_account_new ());
+       }
+               
        if (!tny_account) {
-               g_printerr ("modest: cannot create account for local folders");
+               g_printerr ("modest: %s: cannot create account for local folders. filepath=%s", 
+                       __FUNCTION__, location_filepath);
                return NULL;
        }
        tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
@@ -461,21 +481,38 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
                location_filepath && 
                (strcmp (location_filepath, MODEST_MCC1_VOLUMEPATH) == 0);
                
-       /* TODO: Use hildon_file_system_info_async_new() to get the display name? */
-#if 0
-       const gchar *uri = "file:///media/mmc1";
-       /* HildonFileSystemInfoHandle *async_handle = */
-       hildon_file_system_info_async_new(uri, 
-               on_modest_file_system_info, NULL /* user_data */);
-#endif
-
+       /* The name of memory card locations will be updated asynchronously.
+        * This is just a default: */
        const gchar *name = is_mmc ? _("Memory Card") : 
                MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME;
        tny_account_set_name (TNY_ACCOUNT(tny_account), name); 
        
+       /* Get the correct display name for memory cards, asynchronously: */
+       if (location_filepath) {
+               GError *error = NULL;
+               gchar *uri = g_filename_to_uri(location_filepath, NULL, &error);
+               if (error) {
+                       g_warning ("%s: g_filename_to_uri(%s) failed: %s", __FUNCTION__, 
+                               location_filepath, error->message);
+                       g_error_free (error);
+                       error = NULL;   
+               } else if (uri) {
+                       /* TODO: gnome_vfs_volume_get_display_name() does not return 
+                        * the same string. But why not? Why does hildon needs its own 
+                        * function for this?
+                        */
+                       hildon_file_system_info_async_new(uri, 
+                               on_modest_file_system_info, tny_account /* user_data */);
+                               
+                       g_free (uri);
+                       uri = NULL;
+               }
+       }
+       
+       
        const gchar* id = is_mmc ? MODEST_MMC_ACCOUNT_ID :
                MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID;
-       tny_account_set_id (TNY_ACCOUNT(tny_account), id); 
+       tny_account_set_id (TNY_ACCOUNT(tny_account), id);
        
        tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
        tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy);