#include <tny-account.h>
#include <tny-account-store.h>
#include <tny-store-account.h>
+#include <tny-error.h>
#include <tny-transport-account.h>
#include <tny-simple-list.h>
#include <tny-account-store.h>
#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 */
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
NULL, NULL,
- modest_marshal_VOID__STRING_POINTER_POINTER_POINTER,
- G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
+ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER,
+ G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER,
G_TYPE_POINTER);
}
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);
}
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);
"account_store"));
}
+/* 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)
{
const TnyAccountStore *account_store;
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
+ gchar *username = NULL;
gchar *pwd = NULL;
gpointer pwd_ptr;
gboolean already_asked;
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...*/
/* if the password is not already there, try ModestConf */
if (!already_asked) {
pwd = modest_account_mgr_get_string (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD,TRUE);
+ key, MODEST_ACCOUNT_PASSWORD, TRUE);
g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd));
}
/* if it was already asked, it must have been wrong, so ask again */
if (already_asked || !pwd || strlen(pwd) == 0) {
-
/* we don't have it yet. Get the password from the user */
- const gchar* name = tny_account_get_name (account);
+ const gchar* account_id = tny_account_get_id (account);
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,
- name, &pwd, cancel, &remember);
+ account_id, /* server_account_name */
+ &username, &pwd, cancel, &remember);
if (!*cancel) {
if (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;
} else
*cancel = FALSE;
+ /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
+
return pwd;
}
static GSList*
get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
{
- ModestTnyAccountStorePrivate *priv;
- GSList *account_names, *cursor;
+ ModestTnyAccountStorePrivate *priv = NULL;
+ GSList *account_names = NULL, *cursor = NULL;
GSList *accounts = NULL;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
static gboolean
modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
- const gchar *prompt)
+ const GError *error)
{
- GtkMessageType gtktype;
+ g_return_val_if_fail (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); */
+
+
+
+ const 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);
+ prompt = _("Modest account not yet fully configured.");
+ 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:
gtktype = GTK_MESSAGE_ERROR;
break;
}
-
- 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;
projects / modest / blobdiff