#include <modest-protocol-info.h>
#include <modest-local-folder-info.h>
#include <modest-tny-account.h>
+#include <modest-tny-local-folders-account.h>
#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
+#include <widgets/modest-window-mgr.h>
+#include <modest-account-settings-dialog.h>
+
#include "modest-tny-account-store.h"
#include "modest-tny-platform-factory.h"
#include <tny-maemo-conic-device.h>
#ifdef MODEST_HILDON_VERSION_0
#include <hildon-widgets/hildon-note.h>
+#include <hildon-widgets/hildon-banner.h>
#else
#include <hildon/hildon-note.h>
+#include <hildon/hildon-banner.h>
#endif
#endif
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+
/* 'private'/'protected' functions */
static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass);
//static void modest_tny_account_store_init (ModestTnyAccountStore *obj);
static void modest_tny_account_store_init (gpointer g, gpointer iface_data);
-static GSList*
+static void
get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type);
TnySessionCamel *session;
TnyDevice *device;
- /* we cache them here */
+ /* We cache the lists of accounts here.
+ * They are created in our get_accounts_func() implementation. */
GSList *store_accounts;
GSList *transport_accounts;
+
+ /* This is also contained in store_accounts,
+ * but we cached it temporarily separately,
+ * because we create this while creating the transport accounts,
+ * but return it when requesting the store accounts:
+ */
+ GSList *store_accounts_outboxes;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
}
+
+static void
+on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data);
+
+static void
+on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data);
+
static void
modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
{
*/
priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
+
+ /* Respond to volume mounts and unmounts, such
+ * as the insertion/removal of the memory card: */
+ GnomeVFSVolumeMonitor* monitor =
+ gnome_vfs_get_volume_monitor();
+ g_signal_connect (G_OBJECT(monitor), "volume-mounted",
+ G_CALLBACK(on_vfs_volume_mounted),
+ obj);
+ g_signal_connect (G_OBJECT(monitor), "volume-unmounted",
+ G_CALLBACK(on_vfs_volume_unmounted),
+ obj);
}
-
-
static void
account_list_free (GSList *accounts)
{
g_slist_free (accounts);
}
+static void
+recreate_all_accounts (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ if (priv->store_accounts_outboxes) {
+ account_list_free (priv->store_accounts_outboxes);
+ priv->store_accounts_outboxes = NULL;
+ }
+
+ if (priv->store_accounts) {
+ account_list_free (priv->store_accounts);
+ priv->store_accounts = NULL;
+ get_server_accounts (TNY_ACCOUNT_STORE(self),
+ NULL, TNY_ACCOUNT_TYPE_STORE);
+ }
+
+ if (priv->transport_accounts) {
+ account_list_free (priv->transport_accounts);
+ priv->transport_accounts = NULL;
+ get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
+ }
+}
+
+static void
+on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data)
+{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+
+ /* Check whether this was the external MMC1 card: */
+ gchar *uri = gnome_vfs_volume_get_activation_uri (volume);
+ if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) {
+ printf ("DEBUG: %s: MMC1 card mounted.\n", __FUNCTION__);
+
+ /* TODO: Just add an account and emit (and respond to)
+ * TnyAccountStore::accountinserted signal?
+ */
+ recreate_all_accounts (self);
+
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
+ NULL);
+ }
+
+ g_free (uri);
+}
+
+static void
+on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data)
+{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+
+ /* Check whether this was the external MMC1 card: */
+ gchar *uri = gnome_vfs_volume_get_activation_uri (volume);
+ if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) {
+ printf ("DEBUG: %s: MMC1 card unmounted.\n", __FUNCTION__);
+
+ /* TODO: Just add an account and emit (and respond to)
+ * TnyAccountStore::accountinserted signal?
+ */
+ recreate_all_accounts (self);
+
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
+ NULL);
+ }
+
+ g_free (uri);
+}
static void
on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account,
gpointer user_data)
{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+
/* FIXME: make this more finegrained; changes do not really affect _all_
* accounts, and some do not affect tny accounts at all (such as 'last_update')
*/
+ if (server_account)
+ recreate_all_accounts (self);
- account_list_free (priv->store_accounts);
- priv->store_accounts = get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE);
-
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
- TNY_ACCOUNT_TYPE_TRANSPORT);
-
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
}
-
static void
on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account,
const gchar *key, gboolean server_account, gpointer user_data)
{
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ /* Ignore the change if it's a change in the last_updated value */
+ if (g_str_has_suffix (key, MODEST_ACCOUNT_LAST_UPDATED))
+ return;
+
/* FIXME: make this more finegrained; changes do not really affect _all_
* accounts, and some do not affect tny accounts at all (such as 'last_update')
*/
- if (server_account) {
- if (priv->store_accounts) {
- account_list_free (priv->store_accounts);
- priv->store_accounts =
- get_server_accounts (TNY_ACCOUNT_STORE(self),
- NULL, TNY_ACCOUNT_TYPE_STORE);
- }
-
- if (priv->transport_accounts) {
- account_list_free (priv->transport_accounts);
- priv->transport_accounts =
- get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
- TNY_ACCOUNT_TYPE_TRANSPORT);
- }
- }
+ if (server_account)
+ recreate_all_accounts (self);
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
static gchar*
get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
{
+ /* Initialize the output parameter: */
+ if (cancel)
+ *cancel = FALSE;
+
const gchar *key;
const TnyAccountStore *account_store;
ModestTnyAccountStore *self;
}
/* if it was already asked, it must have been wrong, so ask again */
+ /* TODO: However, when we supply a wrong password to tinymail,
+ * it seems to (at least sometimes) call our alert_func() instead of
+ * asking for the password again.
+ */
if (already_asked || !pwd || strlen(pwd) == 0) {
/* we don't have it yet. Get the password from the user */
const gchar* account_id = tny_account_get_id (account);
return pwd;
}
-
+/* tinymail calls this if the connection failed due to an incorrect password.
+ * And it seems to call this for any general connection failure. */
static void
forget_password (TnyAccount *account)
{
+ printf ("DEBUG: %s\n", __FUNCTION__);
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
const TnyAccountStore *account_store;
return MODEST_TNY_ACCOUNT_STORE(obj);
}
-
+/** Fill the TnyList from the appropriate cached GSList of accounts. */
static void
get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
cursor = accounts;
while (cursor) {
- tny_list_prepend (list, G_OBJECT(cursor->data));
+ if (cursor->data) {
+ GObject *object = G_OBJECT(cursor->data);
+ tny_list_prepend (list, object);
+ }
+
cursor = cursor->next;
}
}
+static void
+create_per_account_local_outbox_folders (TnyAccountStore *self)
+{
+ g_return_if_fail (self);
+
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* printf("DEBUG: %s: priv->store_accounts_outboxes = %p\n", __FUNCTION__, priv->store_accounts_outboxes); */
+
+ GSList *accounts = NULL;
+
+ GSList *account_names = modest_account_mgr_account_names (priv->account_mgr,
+ TRUE /* including disabled accounts */);
+
+ GSList *iter = NULL;
+ for (iter = account_names; iter; iter = g_slist_next (iter)) {
+
+ const gchar* account_name = (const gchar*)iter->data;
+
+ /* Create a per-account local outbox folder (a _store_ account)
+ * for each _transport_ account: */
+ TnyAccount *tny_account_outbox =
+ modest_tny_account_new_for_per_account_local_outbox_folder (
+ priv->account_mgr, account_name, priv->session);
+
+ accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */
+ };
+
+ g_slist_free (account_names);
+
+ priv->store_accounts_outboxes = accounts;
+}
-
-/* this function fills the TnyList, and also returns a GSList of the accounts,
- * for caching purposes
+/* This function fills the TnyList, and also stores a GSList of the accounts,
+ * for caching purposes. It creates the TnyAccount objects if necessary.
+ * The @list parameter may be NULL, if you just want to fill the cache.
*/
-static GSList*
+static void
get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
- ModestTnyAccountStorePrivate *priv = NULL;
+ g_return_if_fail (self);
+
+ /* printf ("DEBUG: %s: list=%p, type=%d\n", __FUNCTION__, list, type); */
+
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* Do nothing if the accounts are already cached: */
+ if (type == TNY_ACCOUNT_TYPE_STORE) {
+ if (priv->store_accounts)
+ return;
+ } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ if (priv->transport_accounts)
+ return;
+ }
+
GSList *account_names = NULL, *cursor = NULL;
GSList *accounts = NULL;
-
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- /* these account names, not server_account names */
+ /* These are account names, not server_account names */
account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE);
for (cursor = account_names; cursor; cursor = cursor->next) {
/* we get the server_accounts for enabled accounts */
if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
+
+ /* Add the account: */
TnyAccount *tny_account =
modest_tny_account_new_from_account (priv->account_mgr,
account_name,
if (list)
tny_list_prepend (list, G_OBJECT(tny_account));
- accounts = g_slist_append (accounts, tny_account); /* cache it */
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
} else
g_printerr ("modest: failed to create account for %s\n",
account_name);
+ }
+ }
+
+ if (type == TNY_ACCOUNT_TYPE_STORE) {
+ /* Also add the Memory card account if it is mounted: */
+ gboolean mmc_is_mounted = FALSE;
+ GnomeVFSVolumeMonitor* monitor =
+ gnome_vfs_get_volume_monitor();
+ GList* list_volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor);
+ GList *iter = list_volumes;
+ while (iter) {
+ GnomeVFSVolume *volume = (GnomeVFSVolume*)iter->data;
+ if (volume) {
+ if (!mmc_is_mounted) {
+ gchar *uri = gnome_vfs_volume_get_activation_uri (volume);
+ if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) {
+ mmc_is_mounted = TRUE;
+ }
+ g_free (uri);
+ }
+
+ gnome_vfs_volume_unref(volume);
+ }
+
+ iter = g_list_next (iter);
+ }
+ g_list_free (list_volumes);
+
+ if (mmc_is_mounted) {
+ TnyAccount *tny_account =
+ modest_tny_account_new_for_local_folders (priv->account_mgr,
+ priv->session, MODEST_MCC1_VOLUMEPATH);
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
}
- g_free (account_name);
}
- g_slist_free (account_names);
- /* also, add the local folder pseudo-account */
+ /* And add the connection-specific transport accounts, if any.
+ * Note that these server account instances might never be used
+ * if their connections are never active: */
+ /* Look at each modest account: */
+ if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ GSList *iter_account_names = account_names;
+ while (iter_account_names) {
+ const gchar* account_name = (const gchar*)(iter_account_names->data);
+ GSList *list_specifics = modest_account_mgr_get_list (priv->account_mgr,
+ account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
+
+ /* Look at each connection-specific transport account for the
+ * modest account: */
+ GSList *iter = list_specifics;
+ while (iter) {
+ /* const gchar* this_connection_name = (const gchar*)(iter->data); */
+ iter = g_slist_next (iter);
+ if (iter) {
+ const gchar* transport_account_name = (const gchar*)(iter->data);
+ if (transport_account_name) {
+ TnyAccount * tny_account = NULL;
+ /* Add the account: */
+ tny_account = modest_tny_account_new_from_server_account_name (
+ priv->account_mgr, transport_account_name);
+ if (tny_account) {
+ g_object_set_data (G_OBJECT(tny_account), "account_store",
+ (gpointer)self);
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
+
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
+ } else
+ g_printerr ("modest: failed to create smtp-specific account for %s\n",
+ transport_account_name);
+ }
+ }
+
+ iter = g_slist_next (iter);
+ }
+
+ iter_account_names = g_slist_next (iter_account_names);
+ }
+ }
+
+ g_slist_free (account_names);
+ account_names = NULL;
+
+ /* TODO: Delete the strings in the GSList */
+
+
+ /* We also create a per-account local outbox folder (a _store_ account)
+ * for each _transport_ account. */
+ if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ /* Now would be a good time to create the per-account local outbox folder
+ * _store_ accounts corresponding to each transport account: */
+ if (!priv->store_accounts_outboxes) {
+ create_per_account_local_outbox_folders (self);
+ }
+ }
+
+ /* But we only return the per-account local outbox folder when
+ * _store_ accounts are requested. */
if (type == TNY_ACCOUNT_TYPE_STORE) {
- TnyAccount *tny_account =
- modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session);
- if (list)
- tny_list_prepend (list, G_OBJECT(tny_account));
- accounts = g_slist_append (accounts, tny_account); /* cache it */
- }
- return accounts;
+ /* Create them if necessary,
+ * (which also requires creating the transport accounts,
+ * if necessary.) */
+ if (!priv->store_accounts_outboxes) {
+ create_per_account_local_outbox_folders (self);
+ }
+
+ /* Add them to the TnyList: */
+ if (priv->store_accounts_outboxes) {
+ GSList *iter = NULL;
+ for (iter = priv->store_accounts_outboxes; iter; iter = g_slist_next (iter)) {
+ TnyAccount *outbox_account = (TnyAccount*)iter->data;
+ if (list && outbox_account)
+ tny_list_prepend (list, G_OBJECT(outbox_account));
+
+ g_object_ref (outbox_account);
+ accounts = g_slist_append (accounts, outbox_account);
+ }
+
+
+ /* Also add the local folder pseudo-account: */
+ TnyAccount *tny_account =
+ modest_tny_account_new_for_local_folders (priv->account_mgr,
+ priv->session, NULL);
+ /* Add a merged folder, merging all the per-account outbox folders: */
+ modest_tny_local_folders_account_add_merged_outbox_folders (
+ MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account), priv->store_accounts_outboxes);
+
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
+
+
+ /* We have finished with this temporary list, so free it: */
+ account_list_free (priv->store_accounts_outboxes);
+ priv->store_accounts_outboxes = NULL;
+ }
+ }
+
+ if (type == TNY_ACCOUNT_TYPE_STORE) {
+ /* Store the cache: */
+ priv->store_accounts = accounts;
+ } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ /* Store the cache: */
+ priv->transport_accounts = accounts;
+ }
}
if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
if (!priv->store_accounts)
- priv->store_accounts =
- get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
+ get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
else
get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
} else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) {
if (!priv->transport_accounts)
- priv->transport_accounts =
- get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
+ get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
else
get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
} else
/* prompt = _("Modest account not yet fully configured."); */
prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"),
error->message);
+
+ /* TODO: If we can ever determine that the problem is a wrong password:
+ * In this case, the UI spec wants us to show a banner, and then
+ * open the Account Settings dialog. */
+ /* Note: Sometimes, the get_password() function seems to be called again
+ * when a password is wrong, but sometimes this alert_func is called. */
+ #if 0
+ GtkWidget *parent_widget =
+ GTK_WIDGET (
+ modest_window_mgr_get_main_window (
+ modest_runtime_get_window_mgr ()));
+
+ hildon_banner_show_information (
+ parent_widget,
+ NULL /* icon name */,
+ _("mcen_ib_username_pw_incorrect") );
+
+ /* Show the Account Settings window: */
+ ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+ /* TODO: Get the account somehow. Maybe tinymail should send it with the signal. */
+ const gchar* modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ g_assert (modest_account_name);
+ modest_account_settings_dialog_set_account_name (dialog,
+ modest_account_name);
+
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ #endif
+
break;
+
+ //TODO: We have started receiving errors of
+ //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, messagae="Canceled".
+ //If this is really a result of us cancelling our own operation then
+ //a) this probably shouldn't be an error, and
+ //b) should have its own error code.
+
default:
g_warning ("%s: Unhandled GError code: %d, message=%s",
__FUNCTION__, error->code, error->message);
if (!prompt)
return FALSE;
- gboolean retval = FALSE;
#ifdef MODEST_PLATFORM_MAEMO
/* The Tinymail documentation says that we should show Yes and No buttons,
- * but these never seem to be questions: */
- GtkWidget *dialog = GTK_WIDGET (hildon_note_new_information (NULL, prompt));
+ * when it is a question.
+ * Obviously, we need tinymail to use more specific error codes instead,
+ * so we know what buttons to show. */
+ GtkWidget *dialog = NULL;
+ if (question) {
+ dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL,
+ prompt));
+ } else {
+ dialog = GTK_WIDGET (hildon_note_new_information (NULL,
+ prompt));
+ }
#else
GtkMessageType gtktype = GTK_MESSAGE_ERROR;
gtktype, GTK_BUTTONS_YES_NO, prompt);
#endif /* #ifdef MODEST_PLATFORM_MAEMO */
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
- retval = TRUE;
-
-#ifdef MODEST_PLATFORM_MAEMO
- /* FIXME: for mameo, assume it's ok; thus, we can get passed
- * SSL cert notes etc.
- */
- retval = TRUE;
-#endif /*MODEST_PLATFORM_MAEMO*/
+ gboolean retval = TRUE;
+ const int response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (question) {
+ retval = (response == GTK_RESPONSE_YES) ||
+ (response == GTK_RESPONSE_OK);
+ }
-
gtk_widget_destroy (dialog);
/* TODO: Don't free this when we no longer strdup the message for testers. */
g_free (prompt);
-
+ /* printf("DEBUG: %s: returning %d\n", __FUNCTION__, retval); */
return retval;
}
TnyAccountType type)
{
TnyAccount *account = NULL;
- ModestAccountData *account_data;
- const gchar *id = NULL;
+ gchar *id = NULL;
ModestTnyAccountStorePrivate *priv;
g_return_val_if_fail (self, NULL);
NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name);
- if (!account_data) {
- g_printerr ("modest: cannot get account data for account '%s'\n", account_name);
- return NULL;
- }
- if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
- id = account_data->store_account->account_name;
- else if (account_data->transport_account)
- id = account_data->transport_account->account_name;
+ /* Special case for the local account */
+ if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) &&
+ type == TNY_ACCOUNT_TYPE_STORE) {
+ id = g_strdup (MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+ } else {
+ ModestAccountData *account_data;
+
+ account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name);
+ if (!account_data) {
+ g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__, account_name);
+ return NULL;
+ }
+
+ if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
+ id = g_strdup (account_data->store_account->account_name);
+ else if (account_data->transport_account)
+ id = g_strdup (account_data->transport_account->account_name);
+
+ modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+ }
if (!id)
g_printerr ("modest: could not get an id for account %s\n",
if (!account)
g_printerr ("modest: could not get tny %s account for %s (id=%s)\n",
- type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport",
+ type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport",
account_name, id ? id : "<none>");
- modest_account_mgr_free_account_data (priv->account_mgr, account_data);
return account;
}
g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
+ /* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */
if (!iap_id)
return NULL;
return NULL;
const gchar *connection_name = con_ic_iap_get_name (connection);
+ /* printf ("DEBUG: %s: connection_name=%s\n", __FUNCTION__, connection_name); */
if (!connection_name)
return NULL;
ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager,
account_name, connection_name);
-
- if (!server_account_name)
+
+ /* printf ("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
+ if (!server_account_name) {
return NULL; /* No connection-specific SMTP server was specified for this connection. */
+ }
TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name);
+
+ /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */
g_free (server_account_name);
/* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
/* If there is no connection-specific transport account (the common case),
* just get the regular transport account: */
- if (!account) {
+ if (!account) {
+ /* printf("DEBUG: %s: using regular transport account for account %s.\n", __FUNCTION__, account_name); */
account = modest_tny_account_store_get_tny_account_by_account (self, account_name,
TNY_ACCOUNT_TYPE_TRANSPORT);
}
return account;
}
+
+gboolean modest_tny_account_is_virtual_local_folders (TnyAccount *self)
+{
+ /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount
+ * for anything else. */
+ return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self);
+}
projects / modest / blobdiff