From 1d50662808bba8e1fb6f4b685dfdc352c6341940 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Tue, 10 Dec 2013 14:47:32 +1000 Subject: [PATCH] [telepathy-sasl-signon] Only set CredentialsNeedUpdate flag when appropriate Previously, the CredentialsNeedUpdate flag would be set in a variety of situations, including when a generic OperationFailed error occurred. This commit ensures that it is only set for an account when a UserInteraction error occurs (that is, the account credentials are valid but need to be refreshed manually by the user). --- telepathy-sasl-signon/empathy-uoa-auth-handler.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/telepathy-sasl-signon/empathy-uoa-auth-handler.c b/telepathy-sasl-signon/empathy-uoa-auth-handler.c index e4ff83f..a561ea1 100644 --- a/telepathy-sasl-signon/empathy-uoa-auth-handler.c +++ b/telepathy-sasl-signon/empathy-uoa-auth-handler.c @@ -224,14 +224,10 @@ session_process_cb (SignonAuthSession *session, if (error != NULL) { DEBUG ("Error processing the session: %s", error->message); - if (g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_CREDENTIALS_NOT_AVAILABLE) || - g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_INVALID_CREDENTIALS) || - g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_MISSING_DATA) || - g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_USER_INTERACTION) || - g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_OPERATION_FAILED)) + if (g_error_matches(error, SIGNON_ERROR, SIGNON_ERROR_USER_INTERACTION)) { request_password(ctx); - } + } else { auth_context_done (ctx);