telepathy-mission-control: Simplify the account connection pipeline, and make it private

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 0d6ef9401dfe24d3b8dd04e29196d64da6c22279
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=0d6ef9401dfe24d3b8dd04e29196d64da6c22279

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jan 30 15:19:14 2014 +0000

Simplify the account connection pipeline, and make it private

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71093
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 src/mcd-account.c |   14 ++++++--------
 src/mcd-account.h |    4 ----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 77ef5df..aea13e2 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -3301,6 +3301,9 @@ _mcd_account_constructor (GType type, guint n_params,
     return (GObject *) account;
 }
 
+static void mcd_account_connection_proceed_with_reason
+    (McdAccount *account, gboolean success, TpConnectionStatusReason reason);
+
 static void
 monitor_state_changed_cb (
     McdConnectivityMonitor *monitor,
@@ -4982,7 +4985,9 @@ _mcd_account_connection_begin (McdAccount *account,
                                         TP_CONNECTION_STATUS_REASON_REQUESTED,
                                         NULL, NULL, NULL);
     account->priv->connection_context = ctx;
-    mcd_account_connection_proceed (account, TRUE);
+
+    mcd_account_connection_proceed_with_reason
+        (account, TRUE, TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED);
 }
 
 void
@@ -5048,10 +5053,3 @@ mcd_account_connection_proceed_with_reason (McdAccount *account,
             _mcd_account_connection_context_free);
     }
 }
-
-void
-mcd_account_connection_proceed (McdAccount *account, gboolean success)
-{
-    mcd_account_connection_proceed_with_reason
-        (account, success, TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED);
-}
diff --git a/src/mcd-account.h b/src/mcd-account.h
index 30763c9..86d2b82 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -152,10 +152,6 @@ gboolean mcd_account_get_waiting_for_connectivity (McdAccount *self);
 void mcd_account_set_waiting_for_connectivity (McdAccount *self,
     gboolean waiting);
 
-void mcd_account_connection_proceed (McdAccount *account, gboolean success);
-void mcd_account_connection_proceed_with_reason
-    (McdAccount *account, gboolean success, TpConnectionStatusReason reason);
-
 McpAccountStorage *mcd_account_get_storage_plugin (McdAccount *account);
 
 G_END_DECLS