[telepathy-mission-control/master] McdConnection: make mcd_connection_connect() internal

[Simon McVittie]

---
 src/mcd-account-connection.c |    2 +-
 src/mcd-account.c            |    2 +-
 src/mcd-connection.c         |   14 +++++++-------
 src/mcd-connection.h         |    3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/mcd-account-connection.c b/src/mcd-account-connection.c
index b4f23ff..07d2b17 100644
--- a/src/mcd-account-connection.c
+++ b/src/mcd-account-connection.c
@@ -83,7 +83,7 @@ mcd_account_connection_proceed (McdAccount *account, gboolean success)
 
     /* call next handler, or terminate the chain (emitting proper signal).
      * if everything is fine, call mcd_manager_create_connection() and
-     * mcd_connection_connect () with the dynamic parameters. Remove that call
+     * _mcd_connection_connect () with the dynamic parameters. Remove that call
      * from mcd_manager_create_connection() */
     ctx = g_object_get_qdata ((GObject *)account,
 			      account_connection_context_quark);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 94f366c..7c6c9bb 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -492,7 +492,7 @@ _mcd_account_connect (McdAccount *account, GHashTable *params)
         connection = mcd_manager_create_connection (priv->manager, account);
         _mcd_account_set_connection (account, connection);
     }
-    mcd_connection_connect (priv->connection, params);
+    _mcd_connection_connect (priv->connection, params);
 }
 
 #ifdef DELAY_PROPERTY_CHANGED
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 2559940..5283fec 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -285,9 +285,9 @@ _mcd_connection_set_presence (McdConnection * connection,
 
     if (!priv->tp_conn)
     {
-	DEBUG ("tp_conn is NULL");
-	mcd_connection_connect (connection, NULL);
-	return;
+        DEBUG ("tp_conn is NULL");
+        _mcd_connection_connect (connection, NULL);
+        return;
     }
     g_return_if_fail (TP_IS_CONNECTION (priv->tp_conn));
 
@@ -1063,7 +1063,7 @@ static gboolean
 mcd_connection_reconnect (McdConnection *connection)
 {
     DEBUG ("%p", connection);
-    mcd_connection_connect (connection, NULL);
+    _mcd_connection_connect (connection, NULL);
     return FALSE;
 }
 
@@ -2420,15 +2420,15 @@ mcd_connection_close (McdConnection *connection)
     mcd_mission_abort (MCD_MISSION (connection));
 }
 
-/**
- * mcd_connection_connect:
+/*
+ * _mcd_connection_connect:
  * @connection: the #McdConnection.
  * @params: a #GHashTable of connection parameters.
  *
  * Activate @connection. The connection takes ownership of @params.
  */
 void
-mcd_connection_connect (McdConnection *connection, GHashTable *params)
+_mcd_connection_connect (McdConnection *connection, GHashTable *params)
 {
     McdConnectionPrivate *priv;
 
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index 6810331..aba10cf 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -88,7 +88,8 @@ gboolean mcd_connection_cancel_channel_request (McdConnection *connection,
 						const gchar *requestor_client_id,
 					       	GError **error);
 
-void mcd_connection_connect (McdConnection *connection, GHashTable *params);
+G_GNUC_INTERNAL void _mcd_connection_connect (McdConnection *connection,
+                                              GHashTable *params);
 void mcd_connection_close (McdConnection *connection);
 
 /* not exported */
-- 
1.5.6.5