sasl-handler: only save password if we manage to connect

https://bugzilla.gnome.org/show_bug.cgi?id=659053

diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index b06d7bf4ca4d5a5d50026930fd2d583efee2b7e2..78db431e63811e79eaf49e39643f914530ecaab1 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -50,6 +50,7 @@ typedef struct {
   GSimpleAsyncResult *result;
 
   gchar *password;
+  gboolean save_password;
 
   GSimpleAsyncResult *async_init_res;
 } EmpathyServerSASLHandlerPriv;
@@ -70,6 +71,25 @@ static const gchar *sasl_statuses[] = {
   "client failed",
 };
 
+static void
+empathy_server_sasl_handler_set_password_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
+          &error))
+    {
+      DEBUG ("Failed to set password: %s", error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      DEBUG ("Password set successfully.");
+    }
+}
+
 static void
 sasl_status_changed_cb (TpChannel *channel,
     TpSASLStatus status,
@@ -91,6 +111,15 @@ sasl_status_changed_cb (TpChannel *channel,
 
   if (status == TP_SASL_STATUS_SERVER_SUCCEEDED)
     {
+      if (priv->save_password)
+        {
+          DEBUG ("Saving password in keyring");
+
+          empathy_keyring_set_account_password_async (priv->account,
+              priv->password, empathy_server_sasl_handler_set_password_cb,
+              NULL);
+        }
+
       DEBUG ("Calling AcceptSASL");
       tp_cli_channel_interface_sasl_authentication_call_accept_sasl (
           priv->channel, -1, NULL, NULL, NULL, NULL);
@@ -369,25 +398,6 @@ start_mechanism_with_data_cb (TpChannel *proxy,
   DEBUG ("Started mechanism successfully");
 }
 
-static void
-empathy_server_sasl_handler_set_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-
-  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
-          &error))
-    {
-      DEBUG ("Failed to set password: %s", error->message);
-      g_clear_error (&error);
-    }
-  else
-    {
-      DEBUG ("Password set successfully.");
-    }
-}
-
 void
 empathy_server_sasl_handler_provide_password (
     EmpathyServerSASLHandler *handler,
@@ -433,9 +443,11 @@ empathy_server_sasl_handler_provide_password (
     {
       if (may_save_response)
         {
-          DEBUG ("Saving password in keyring");
-          empathy_keyring_set_account_password_async (priv->account, password,
-              empathy_server_sasl_handler_set_password_cb, NULL);
+          g_free (priv->password);
+
+          /* We'll save the password if we manage to connect */
+          priv->password = g_strdup (password);
+          priv->save_password = TRUE;
         }
       else if (tp_proxy_has_interface_by_id (priv->channel,
             EMP_IFACE_QUARK_CHANNEL_INTERFACE_CREDENTIALS_STORAGE))