#ifdef MODEST_PLATFORM_MAEMO
#include <tny-maemo-conic-device.h>
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-note.h>
+#else
+#include <hildon/hildon-note.h>
+#endif
#endif
/* 'private'/'protected' functions */
static void modest_tny_account_store_init (gpointer g, gpointer iface_data);
+static GSList*
+get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type);
+
+
/* list my signals */
enum {
ACCOUNT_UPDATE_SIGNAL,
priv->session = NULL;
priv->device = NULL;
+ /* An in-memory store of passwords,
+ * for passwords that are not remembered in the configuration,
+ * so they need to be asked for from the user once in each session:
+ */
priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
}
* accounts, and some do not affect tny accounts at all (such as 'last_update')
*/
-
account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
+ priv->store_accounts = get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE);
account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
-
+ 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, gboolean server_account,
- const gchar *key, gpointer user_data)
+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);
/* 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 (priv->store_accounts) {
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
- }
-
- if (priv->transport_accounts) {
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ 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);
+ }
}
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
"account_store"));
}
-/* This callback will be called by Tinymail when it needs the password.
+/* This callback will be called by Tinymail when it needs the password
+ * from the user, for instance if the password was not remembered.
* Note that TnyAccount here will be the server account. */
static gchar*
get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
self = MODEST_TNY_ACCOUNT_STORE (account_store);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ /* This hash map stores passwords, including passwords that are not stored in gconf. */
/* is it in the hash? if it's already there, it must be wrong... */
pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
* type-punned ptrs...*/
gboolean remember = FALSE;
pwd = NULL;
+ /* Note that we ignore the returned username here,
+ * because it is enough that it will be stored in gconf
+ * by the signal handler. */
g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
account_id, /* server_account_name */
&username, &pwd, cancel, &remember);
g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup(pwd));
} else {
g_hash_table_remove (priv->password_hash, key);
+
+ g_free (pwd);
+ pwd = NULL;
}
g_free (username);
username = NULL;
-
- g_free (pwd);
- pwd = NULL;
-
} else
*cancel = FALSE;
* for caching purposes
*/
static GSList*
-get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
ModestTnyAccountStorePrivate *priv = NULL;
GSList *account_names = NULL, *cursor = NULL;
GSList *accounts = NULL;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_names = modest_account_mgr_account_names (priv->account_mgr,
- TRUE /* including disabled accounts */);
-
+
+ /* these 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) {
gchar *account_name = (gchar*)cursor->data;
- /* only return enabled accounts */
+ /* we get the server_accounts for enabled accounts */
if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
TnyAccount *tny_account =
modest_tny_account_new_from_account (priv->account_mgr,
if (tny_account) {
g_object_set_data (G_OBJECT(tny_account), "account_store",
(gpointer)self);
- tny_list_prepend (list, G_OBJECT(tny_account));
+ 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 account for %s\n",
if (type == TNY_ACCOUNT_TYPE_STORE) {
TnyAccount *tny_account =
modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session);
- tny_list_prepend (list, G_OBJECT(tny_account));
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
accounts = g_slist_append (accounts, tny_account); /* cache it */
}
return accounts;
}
if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
-
if (!priv->store_accounts)
- priv->store_accounts = get_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
+ priv->store_accounts =
+ 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_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
static gboolean
modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
- const GError *error)
+ gboolean question, const GError *error)
{
g_return_val_if_fail (error, FALSE);
- g_return_val_if_fail (error->domain == TNY_ACCOUNT_ERROR, FALSE);
+
+ if ((error->domain != TNY_ACCOUNT_ERROR)
+ && (error->domain != TNY_ACCOUNT_STORE_ERROR)) {
+ g_warning("%s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s",
+ __FUNCTION__, error->domain, error->message);
+ return FALSE;
+ }
- printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message);
+ /* printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message); */
- GtkMessageType gtktype;
+
+ /* const gchar *prompt = NULL; */
+ gchar *prompt = NULL;
+ switch (error->code) {
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT:
+ /* The tinymail camel implementation just sends us this for almost
+ * everything, so we have to guess at the cause.
+ * It could be a wrong password, or inability to resolve a hostname,
+ * or lack of network, or something entirely different: */
+ case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT:
+ g_debug ("%s: Handling GError domain=%d, code=%d, message=%s",
+ __FUNCTION__, error->domain, error->code, error->message);
+
+ /* TODO: Remove the internal error message for the real release.
+ * This is just so the testers can give us more information: */
+ /* prompt = _("Modest account not yet fully configured."); */
+ prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"),
+ error->message);
+ break;
+ default:
+ g_warning ("%s: Unhandled GError code: %d, message=%s",
+ __FUNCTION__, error->code, error->message);
+ prompt = NULL;
+ break;
+ }
+
+ if (!prompt)
+ return FALSE;
+
gboolean retval = FALSE;
- GtkWidget *dialog;
+#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));
+#else
+ GtkMessageType gtktype = GTK_MESSAGE_ERROR;
switch (type)
{
case TNY_ALERT_TYPE_INFO:
break;
}
- const gchar *prompt = NULL;
- switch (error->code)
- {
- case TNY_ACCOUNT_ERROR_TRY_CONNECT:
- prompt = _("Modest account not yet fully configured");
- break;
- default:
- g_warning ("%s: Unhandled GError code.", __FUNCTION__);
- prompt = NULL;
- break;
- }
-
- if (!prompt)
- return FALSE;
-
- dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
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*/
+
+
gtk_widget_destroy (dialog);
+
+ /* TODO: Don't free this when we no longer strdup the message for testers. */
+ g_free (prompt);
+
+
return retval;
}
}
TnySessionCamel*
-tny_account_store_get_session (TnyAccountStore *self)
+modest_tny_account_store_get_session (TnyAccountStore *self)
{
g_return_val_if_fail (self, NULL);
return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data));
- if (acc_id && strcmp (acc_id, id) == 0) {
+ if (acc_id && strcmp (acc_id, id) == 0) {
account = TNY_ACCOUNT(cursor->data);
break;
}
}
-
+
/* if we already found something, no need to search the transport accounts */
for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) {
const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data));
return account;
}
-static TnyAccount* get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name)
+static TnyAccount*
+get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
+ const gchar *account_name)
{
/* Get the current connection: */
TnyDevice *device = modest_runtime_get_device ();
}
-TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
- const gchar *account_name)
+TnyAccount*
+modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
+ const gchar *account_name)
{
/* Get the connection-specific transport acccount, if any: */
TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name);