X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=a1e31dd522dce173b1cb6b22a2ae54ed7327854e;hb=01db4e94dcf1e9818000eb08c90bc3b09c3a5071;hp=78a67d4d93872a32cc8a76692e7e767a5b4cbc21;hpb=d6c4aca94c0dc6b35dce29f0900cac9d0f4949fe;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 78a67d4..a1e31dd 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -429,52 +429,66 @@ modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, } } + +static gboolean +update_tny_account_for_account (ModestTnyAccountStore *self, ModestAccountMgr *acc_mgr, + const gchar *account_name, TnyAccountType type) +{ + ModestTnyAccountStorePrivate *priv; + TnyList* account_list; + gboolean found = FALSE; + TnyIterator *iter = NULL; + + g_return_val_if_fail (self, FALSE); + g_return_val_if_fail (account_name, FALSE); + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || + type == TNY_ACCOUNT_TYPE_TRANSPORT, + FALSE); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + account_list = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); + + iter = tny_list_create_iterator (account_list); + while (!tny_iterator_is_done (iter) && !found) { + TnyAccount *tny_account; + tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter)); + if (tny_account) { + const gchar* parent_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (tny_account); + if (parent_name && strcmp (parent_name, account_name) == 0) { + found = TRUE; + modest_tny_account_update_from_account (tny_account, acc_mgr, account_name, type); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account); + } + g_object_unref (tny_account); + } + tny_iterator_next (iter); + } + + if (iter) + g_object_unref (iter); + + return found; +} + + static void on_account_changed (ModestAccountMgr *acc_mgr, - const gchar *account, - const GSList *keys, - gboolean server_account, + const gchar *account_name, gpointer user_data) { - printf ("DEBUG: modest: %s\n", __FUNCTION__); - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - - /* - printf ("DEBUG: %s\n", __FUNCTION__); - const GSList *iter = keys; - for (iter = keys; iter; iter = g_slist_next (iter)) { - printf (" DEBUG: %s: key=%s\n", __FUNCTION__, (const gchar*)iter->data); - } - */ - - - /* Ignore the change if it's a change in the last_updated value */ - if (g_slist_length ((GSList *)keys) == 1 && - g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) { - return; - } - /* FIXME: make this more finegrained; changes do not really affect _all_ - * accounts - */ -/* recreate_all_accounts (self); */ - - /* TODO: This doesn't actually work, because - * a) The account name is not sent correctly per key: - * b) We should test the end of the key, not the whole keym - * c) We don't seem to be getting all keys here. - * Instead, we just forget the password for all accounts when we create them, for now. - */ - #if 0 - /* If a password has changed, then forget the previously cached password for this account: */ - if (server_account && keys && g_slist_find_custom ((GSList *)keys, MODEST_ACCOUNT_PASSWORD, (GCompareFunc)strcmp)) { - printf ("DEBUG: %s: Forgetting cached password for account ID=%s\n", __FUNCTION__, account); - modest_tny_account_store_forget_password_in_memory (self, account); - } - #endif + g_debug ("DEBUG: modest: %s\n", __FUNCTION__); - g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, account); + /* Ignore the change if it's a change in the last_updated value */ +// if (key && g_str_has_suffix ((const gchar *) key, MODEST_ACCOUNT_LAST_UPDATED)) +// return; + + if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_STORE)) + g_warning ("%s: failed to update store account for %s", __FUNCTION__, account_name); + if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_TRANSPORT)) + g_warning ("%s: failed to update transport account for %s", __FUNCTION__, account_name); } static void @@ -492,27 +506,20 @@ on_account_settings_hide (GtkWidget *widget, gpointer user_data) g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name); } -static gboolean -on_idle_wrong_password_warning_only (gpointer user_data) +static void +show_password_warning_only () { - gdk_threads_enter(); - ModestWindow *main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); /* Show an explanatory temporary banner: */ hildon_banner_show_information ( GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); - - gdk_threads_leave(); - - return FALSE; /* Don't show again. */ } -static gboolean -on_idle_wrong_password (gpointer user_data) +static void +show_wrong_password_dialog (TnyAccount *account) { - TnyAccount *account = (TnyAccount*)user_data; /* This is easier than using a struct for the user_data: */ ModestTnyAccountStore *self = modest_runtime_get_account_store(); ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); @@ -522,12 +529,8 @@ on_idle_wrong_password (gpointer user_data) if (!modest_account_name) { g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n", __FUNCTION__); - - g_object_unref (account); - return FALSE; } - /* Check whether this window is already open, * for instance because of a previous get_password() call: */ @@ -542,7 +545,6 @@ on_idle_wrong_password (gpointer user_data) ModestWindow *main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - gdk_threads_enter (); gboolean created_dialog = FALSE; if (!found || !dialog) { dialog = modest_account_settings_dialog_new (); @@ -571,75 +573,21 @@ on_idle_wrong_password (gpointer user_data) * though it is probably open already: */ gtk_window_present (GTK_WINDOW (dialog)); } - - g_object_unref (account); - gdk_threads_leave (); - - return FALSE; /* Dont' call this again. */ } -typedef struct -{ - GMainLoop *loop; - ModestTnyAccountStore* account_store; - const gchar* server_account_id; - gchar **username; - gchar **password; - gboolean *cancel; - gboolean *remember; -} IdlePasswordRequest; - -static gboolean -on_idle_request_password (gpointer user_data) -{ - gdk_threads_enter(); - - IdlePasswordRequest* info = (IdlePasswordRequest*)user_data; - g_signal_emit (G_OBJECT(info->account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, - info->server_account_id, /* server_account_name */ - info->username, info->password, info->cancel, info->remember); - - if (info->loop) - g_main_loop_quit (info->loop); - - gdk_threads_leave(); - - return FALSE; /* Don't call again. */ -} + static void -request_password_in_main_loop_and_wait (ModestTnyAccountStore *account_store, +request_password_and_wait (ModestTnyAccountStore *account_store, const gchar* server_account_id, gchar **username, gchar **password, gboolean *cancel, gboolean *remember) { - IdlePasswordRequest *data = g_slice_new0 (IdlePasswordRequest); - data->account_store = account_store; - data->server_account_id = server_account_id; - data->username = username; - data->password = password; - data->cancel = cancel; - data->remember = remember; - - data->loop = g_main_loop_new (NULL, FALSE /* not running */); - - /* Cause the function to be run in an idle-handler, which is always - * in the main thread: - */ - g_idle_add (&on_idle_request_password, data); - - /* This main loop will run until the idle handler has stopped it: */ - printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__); - GDK_THREADS_LEAVE(); - g_main_loop_run (data->loop); - GDK_THREADS_ENTER(); - printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__); - printf ("DEBUG: %s: Finished\n", __FUNCTION__); - g_main_loop_unref (data->loop); - - g_slice_free (IdlePasswordRequest, data); + g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + server_account_id, /* server_account_name */ + username, password, cancel, remember); } /* This callback will be called by Tinymail when it needs the password @@ -716,12 +664,8 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc modest_server_account_get_has_password (priv->account_mgr, server_account_name); printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password); if (settings_have_password) { - - /* The password must be wrong, so show the account settings dialog so it can be corrected: */ - /* We show it in the main loop, because this function might not be in the main loop. */ - g_object_ref (account); /* unrefed in the idle handler. */ - g_idle_add (on_idle_wrong_password, account); + show_wrong_password_dialog (account); if (cancel) *cancel = TRUE; @@ -736,10 +680,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc if (already_asked) { /* Show an info banner, before we show the protected password dialog: */ - g_idle_add (on_idle_wrong_password_warning_only, NULL); + show_password_warning_only(); } - request_password_in_main_loop_and_wait (self, account_id, + request_password_and_wait (self, account_id, &username, &pwd, cancel, &remember); if (!*cancel) { @@ -1071,6 +1015,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA break; case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED: + case TNY_ACCOUNT_ERROR_TRY_CONNECT_SERVICE_UNAVAILABLE: /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ g_debug ("%s: Handling GError domain=%d, code=%d (lookup failed), message=%s", __FUNCTION__, error->domain, error->code, error->message); @@ -1157,8 +1102,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA * when it is a question. * Obviously, we need tinymail to use more specific error codes instead, * so we know what buttons to show. */ - - /* TODO: Do this in the main context: */ + GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), prompt)); const int response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -1171,7 +1115,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA } else { /* Just show the error text and use the default response: */ - modest_maemo_show_information_note_in_main_context_and_forget (GTK_WINDOW (main_window), + modest_maemo_show_information_note_and_forget(GTK_WINDOW (main_window), prompt); } @@ -1582,6 +1526,7 @@ insert_account (ModestTnyAccountStore *self, tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL); g_assert (tny_list_get_length (folders) == 1); + iter_folders = tny_list_create_iterator (folders); per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders)); g_object_unref (iter_folders);