- Added a utility function (empathy_account_reconnect_async) to easily

  reconnect an account.
- When we apply changes to an account, instead of disconnecting and
  reconnecting it, we use the new empathy_account_reconnect_async
  function.

2 files changed, 50 insertions, 0 deletions

diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
index 7733f3556..b508f3952 100644
--- a/libempathy/empathy-account.c
+++ b/libempathy/empathy-account.c
@@ -978,6 +978,49 @@ empathy_account_set_enabled_async (EmpathyAccount *account,
 }
 
 static void
+account_reconnected_cb (TpAccount *proxy,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  GSimpleAsyncResult *result = user_data;
+
+  if (error != NULL)
+    g_simple_async_result_set_from_error (result, (GError *) error);
+
+  g_simple_async_result_complete (result);
+  g_object_unref (result);
+}
+
+gboolean
+empathy_account_reconnect_finish (EmpathyAccount *account,
+    GAsyncResult *result,
+    GError **error)
+{
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+          error) ||
+      !g_simple_async_result_is_valid (result, G_OBJECT (account),
+          empathy_account_reconnect_finish))
+    return FALSE;
+
+  return TRUE;
+}
+
+void
+empathy_account_reconnect_async (EmpathyAccount *account,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  EmpathyAccountPriv *priv = GET_PRIV (account);
+
+  GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (account),
+        callback, user_data, empathy_account_reconnect_finish);
+
+  tp_cli_account_call_reconnect (priv->account,
+      -1, account_reconnected_cb, result, NULL, G_OBJECT (account));
+}
+
+static void
 empathy_account_requested_presence_cb (TpProxy *proxy,
   const GError *error,
   gpointer user_data,
diff --git a/libempathy/empathy-account.h b/libempathy/empathy-account.h
index f88ac43e4..8a22335ea 100644
--- a/libempathy/empathy-account.h
+++ b/libempathy/empathy-account.h
@@ -72,6 +72,13 @@ void empathy_account_set_enabled_async (EmpathyAccount *account,
 gboolean empathy_account_set_enabled_finish (EmpathyAccount *account,
     GAsyncResult *result, GError **error);
 
+void empathy_account_reconnect_async (EmpathyAccount *account,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+gboolean empathy_account_reconnect_finish (EmpathyAccount *account,
+    GAsyncResult *result,
+    GError **error);
+
 gboolean empathy_account_is_enabled (EmpathyAccount *account);
 
 gboolean empathy_account_is_valid (EmpathyAccount *account);