* Added a unique identifier per header

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

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 0e521fe..67c0988 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -40,7 +40,12 @@
 #include <tny-camel-imap-store-account.h>
 #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,
@@ -400,10 +405,38 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar
        return tny_account;
 }
 
+/* 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)
+{
+       TnyAccount *account = TNY_ACCOUNT (data);
+       
+       if (error) {
+               printf ("  DEBUG: %s: error=%s\n", __FUNCTION__, error->message);
+       }
+       
+       const gchar *display_name = NULL;
+       if (!error && info) {
+               display_name = hildon_file_system_info_get_display_name(info);
+       }
+       
+       if (display_name) {
+               /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__,  display_name); */
+               tny_account_set_name (account, display_name);
+       }
+}
+
 
 TnyAccount*
-modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session)
+modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
 {
+       /* Make sure that the directories exist: */
+       modest_init_local_folders (location_filepath);
+
        TnyStoreAccount *tny_account;
        CamelURL *url;
        gchar *maildir, *url_string;
@@ -420,7 +453,7 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
        /* This path contains directories for each local folder.
         * We have created them so that TnyCamelStoreAccount can find them 
         * and report a folder for each directory: */
-       maildir = modest_local_folder_info_get_maildir_path ();
+       maildir = modest_local_folder_info_get_maildir_path (location_filepath);
        url = camel_url_new ("maildir:", NULL);
        camel_url_set_path (url, maildir);
        /* Needed by tinymail's DBC assertions */
@@ -430,9 +463,47 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
        tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
        printf("DEBUG: %s:\n  url=%s\n", __FUNCTION__, url_string);
 
-       tny_account_set_name (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME); 
-       tny_account_set_id (TNY_ACCOUNT(tny_account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID); 
-        tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
+       /* TODO: Use a more generic way of identifying memory card paths, 
+        * and of marking accounts as memory card accounts, maybe
+        * via a derived TnyCamelStoreAccount ? */
+       const gboolean is_mmc = 
+               location_filepath && 
+               (strcmp (location_filepath, MODEST_MCC1_VOLUMEPATH) == 0);
+               
+       /* 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_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
        tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy);
        
        modest_tny_account_set_parent_modest_account_name_for_server_account (