[telepathy-mission-control/master] McdConnection: remove mcd_connection_get_connection_status

[Simon McVittie]

It turns out to be a trap - it returns what the account thinks the
connection status is, not what the TpConnection's actual status is. Given
that, it's more comprehensible to use the account method directly.
---
 src/mcd-account-requests.c |    2 +-
 src/mcd-account.c          |    2 +-
 src/mcd-connection.c       |   11 ++---------
 src/mcd-connection.h       |    1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index ca1431e..3150473 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -60,7 +60,7 @@ online_request_cb (McdAccount *account, gpointer userdata, const GError *error)
     DEBUG ("called");
     connection = mcd_account_get_connection (account);
     g_return_if_fail (connection != NULL);
-    g_return_if_fail (mcd_connection_get_connection_status (connection)
+    g_return_if_fail (mcd_account_get_connection_status (account)
                       == TP_CONNECTION_STATUS_CONNECTED);
 
     if (mcd_channel_get_status (channel) == MCD_CHANNEL_STATUS_FAILED)
diff --git a/src/mcd-account.c b/src/mcd-account.c
index a46de4a..1cf3d6e 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -963,7 +963,7 @@ get_connection_status (TpSvcDBusProperties *self,
     TpConnectionStatus status;
 
     if (priv->connection)
-	status = mcd_connection_get_connection_status (priv->connection);
+	status = mcd_account_get_connection_status (account);
     else
 	status = TP_CONNECTION_STATUS_DISCONNECTED;
 
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 72ab677..3c294c5 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1993,13 +1993,6 @@ mcd_connection_get_account (McdConnection * id)
     return priv->account;
 }
 
-TpConnectionStatus
-mcd_connection_get_connection_status (McdConnection * id)
-{
-    McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (id);
-    return mcd_account_get_connection_status (priv->account);
-}
-
 TpConnectionStatusReason
 mcd_connection_get_connection_status_reason (McdConnection *connection)
 {
@@ -2472,7 +2465,7 @@ _mcd_connection_connect (McdConnection *connection, GHashTable *params)
 	priv->reconnect_timer = 0;
     }
 
-    if (mcd_connection_get_connection_status (connection) ==
+    if (mcd_account_get_connection_status (priv->account) ==
         TP_CONNECTION_STATUS_DISCONNECTED)
     {
         if (connection->priv->params != NULL)
@@ -2495,7 +2488,7 @@ _mcd_connection_connect (McdConnection *connection, GHashTable *params)
     else
     {
         DEBUG ("Not connecting because not disconnected (%i)",
-               mcd_connection_get_connection_status (connection));
+               mcd_account_get_connection_status (priv->account));
     }
 }
 
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index fc437be..fdb3b22 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -77,7 +77,6 @@ const gchar *mcd_connection_get_name (McdConnection *connection);
 McdAccount *mcd_connection_get_account (McdConnection * connection);
 
 TpConnection *mcd_connection_get_tp_connection (McdConnection *connection);
-TpConnectionStatus mcd_connection_get_connection_status (McdConnection *connection);
 TpConnectionStatusReason mcd_connection_get_connection_status_reason (McdConnection *connection);
 
 gboolean mcd_connection_request_channel (McdConnection *connection,
-- 
1.5.6.5