[telepathy-mission-control/master] Rename _mcd_master_account_conditions_satisfied to _mcd_master_account_replace_transport

[Simon McVittie]

It has the startling side-effect of binding the account to the selected
transport, so the old name was rather misleading.
---
 src/mcd-account.c     |    2 +-
 src/mcd-master-priv.h |    4 ++--
 src/mcd-master.c      |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index c688dd5..07d5eca 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -207,7 +207,7 @@ _mcd_account_maybe_autoconnect (McdAccount *account)
 
     master = mcd_master_get_default ();
 
-    if (!_mcd_master_account_conditions_satisfied (master, account))
+    if (!_mcd_master_account_replace_transport (master, account))
     {
         DEBUG ("%s conditions not satisfied", priv->unique_name);
         return;
diff --git a/src/mcd-master-priv.h b/src/mcd-master-priv.h
index 82dc279..aaacbb4 100644
--- a/src/mcd-master-priv.h
+++ b/src/mcd-master-priv.h
@@ -32,8 +32,8 @@
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL
-gboolean _mcd_master_account_conditions_satisfied (McdMaster *master,
-                                                   McdAccount *account);
+gboolean _mcd_master_account_replace_transport (McdMaster *master,
+                                                McdAccount *account);
 
 void _mcd_master_get_nth_account_connection (McdMaster *master, gint i,
                                              McdAccountConnectionFunc *func,
diff --git a/src/mcd-master.c b/src/mcd-master.c
index fe565fd..3549211 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -191,7 +191,7 @@ mcd_master_transport_disconnected (McdMaster *master, McdTransportPlugin *plugin
 
             /* it may be that there is another transport to which the account
              * can reconnect */
-            if (_mcd_master_account_conditions_satisfied (master, account))
+            if (_mcd_master_account_replace_transport (master, account))
             {
                 DEBUG ("conditions matched");
                 _mcd_account_connect_with_auto_presence (account);
@@ -816,8 +816,8 @@ _mcd_master_get_nth_account_connection (McdMaster *master,
 }
 
 gboolean
-_mcd_master_account_conditions_satisfied (McdMaster *master,
-                                          McdAccount *account)
+_mcd_master_account_replace_transport (McdMaster *master,
+                                       McdAccount *account)
 {
     McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
     GHashTable *conditions;
-- 
1.5.6.5