#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>
static gchar*
get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
{
+ /* printf("DEBUG: %s\n", __FUNCTION__); */
+
const gchar *key;
const TnyAccountStore *account_store;
ModestTnyAccountStore *self;
} 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);
- account_names = modest_account_mgr_account_names (priv->account_mgr);
+ account_names = modest_account_mgr_account_names (priv->account_mgr,
+ TRUE /* including disabled accounts */);
for (cursor = account_names; cursor; cursor = cursor->next) {
static gboolean
modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
- const gchar *prompt)
+ const GError *error)
{
+ g_return_val_if_fail (error, FALSE);
+
+ printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message);
+
GtkMessageType gtktype;
gboolean retval = FALSE;
GtkWidget *dialog;
gtktype = GTK_MESSAGE_ERROR;
break;
}
+
+ const gchar *prompt = NULL;
+ switch (error->code)
+ {
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT:
+ /* Use a Logical ID: */
+ 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,
gtktype, GTK_BUTTONS_YES_NO, prompt);
}
-
-static void
-modest_tny_account_store_add_store_account (TnyAccountStore *self,
- TnyStoreAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_store_account_func not implemented\n");
-}
-
-
-static void
-modest_tny_account_store_add_transport_account (TnyAccountStore *self,
- TnyTransportAccount *account)
-{
- /* we should not need this...*/
- g_printerr ("modest: add_transport_account_func not implemented\n");
-}
-
-
-
static void
modest_tny_account_store_init (gpointer g, gpointer iface_data)
{
klass->get_accounts_func =
modest_tny_account_store_get_accounts;
- klass->add_transport_account_func =
- modest_tny_account_store_add_transport_account;
- klass->add_store_account_func =
- modest_tny_account_store_add_store_account;
klass->get_cache_dir_func =
modest_tny_account_store_get_cache_dir;
klass->get_device_func =