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,
* 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,
- const gchar *key, gboolean server_account, gpointer user_data)
+ const gchar *key, gboolean server_account, gpointer user_data)
{
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 (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,
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;
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;
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 */
- /* BUT server accounts can't be disabled. */
- if (TRUE)
- /* modest_account_mgr_get_enabled(priv->account_mgr, account_name)) */ {
+ /* 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,
account_name,
(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 account for %s\n",
}
if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
-
if (!priv->store_accounts)
- priv->store_accounts = get_server_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 =
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);
/* const gchar *prompt = NULL; */
gchar *prompt = NULL;
- switch (error->code)
- {
+ 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.
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;
+ 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;
}
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;
}
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_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ id = g_strdup (MODEST_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: cannot get account data for account '%s'\n", 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",
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;
}
-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);
projects / modest / blobdiff