#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>
#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,
/* Per-account outbox folders are each in their own on-disk directory: */
if (special_type == TNY_FOLDER_TYPE_OUTBOX) {
+ const gchar *modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ g_assert (modest_account_name);
+
gchar *account_id = g_strdup_printf (
MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s",
- tny_account_get_id (account));
+ modest_account_name);
- local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
+ local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
account_id);
- g_free (account_id);
+ g_free (account_id);
} else {
/* Other local folders are all in one on-disk directory: */
local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
#define MODEST_ACCOUNT_AUTH_CRAMMD5 "CRAM-MD5"
+
/**
* modest_tny_account_new_from_server_account:
* @account_mgr: a valid account mgr instance
static TnyAccount*
modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
ModestServerAccountData *account_data)
-{
+{
gchar *url = NULL;
g_return_val_if_fail (account_mgr, NULL);
* Note that this is not where we create the special local folders account.
* We do that in modest_tny_account_new_for_local_folders() instead. */
if (account_data->uri) {
- /* printf("DEBUG: %s: Using URI=%s\n", __FUNCTION__, account_data->uri); */
tny_account_set_url_string (TNY_ACCOUNT(tny_account), account_data->uri);
- g_message ("%s: local account-url: %s", __FUNCTION__, account_data->uri);
+/* g_message ("DEBUG: %s: local account-url:\n %s", __FUNCTION__, account_data->uri); */
}
else {
/* Set camel-specific options: */
/* FIXME: for debugging */
url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
- g_message ("modest: account-url: %s", url);
+/* g_message ("modest: %s:\n account-url: %s", __FUNCTION__, url); */
g_free (url);
/***********************/
return tny_account;
}
+TnyAccount*
+modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
+ const gchar *server_account_name)
+{
+ ModestServerAccountData *account_data =
+ modest_account_mgr_get_server_account_data (account_mgr,
+ server_account_name);
+ if (!account_data)
+ return NULL;
+
+ TnyAccount *result = modest_tny_account_new_from_server_account (
+ account_mgr, account_data);
+
+ modest_account_mgr_free_server_account_data (account_mgr, account_data);
+
+ return result;
+}
+
/* we need these dummy functions, or tinymail will complain */
static gchar*
account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
if (!account_data) {
- g_printerr ("modest: cannot get account data for account %s\n", account_name);
+ g_printerr ("modest: %s: cannot get account data for account %s\n", __FUNCTION__, account_name);
return NULL;
}
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;
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);
/* 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 */
url_string = camel_url_to_string (url, 0);
tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
- printf("DEBUG: %s: local folders 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);
+ printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string);
+
+ /* 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 (
TnyAccount*
-modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, TnyAccount *account, TnySessionCamel *session)
+modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, const gchar* account_name, TnySessionCamel *session)
{
g_return_val_if_fail (account_mgr, NULL);
- g_return_val_if_fail (account, NULL);
- g_return_val_if_fail (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_TRANSPORT, NULL);
+ g_return_val_if_fail (account_name, NULL);
/* Notice that we create a ModestTnyOutboxAccount here,
* instead of just a TnyCamelStoreAccount,
/* Make sure that the paths exists on-disk so that TnyCamelStoreAccount can
* find it to create a TnyFolder for it: */
- gchar *folder_dir = modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (account);
+ gchar *folder_dir = modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (account_name);
modest_init_one_local_folder(folder_dir);
g_free (folder_dir);
folder_dir = NULL;
/* This path should contain just one directory - "outbox": */
gchar *maildir =
- modest_per_account_local_outbox_folder_info_get_maildir_path (account);
+ modest_per_account_local_outbox_folder_info_get_maildir_path (account_name);
CamelURL *url = camel_url_new ("maildir:", NULL);
camel_url_set_path (url, maildir);
camel_url_free (url);
tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
- printf("DEBUG: %s: local outbox folder account url=%s\n", __FUNCTION__, url_string);
+ printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string);
g_free (url_string);
/* This text should never been seen,
gchar *account_id = g_strdup_printf (
MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s",
- tny_account_get_id (account));
+ account_name);
tny_account_set_id (TNY_ACCOUNT(tny_account), account_id);
g_free (account_id);
projects / modest / blobdiff