[telepathy-mission-control/master] McdMaster: make _mcd_master_lookup_manager private

[Simon McVittie]

---
 src/mcd-account-manager.c |    3 ++-
 src/mcd-account.c         |    2 +-
 src/mcd-master-priv.h     |    3 +++
 src/mcd-master.c          |    8 ++++----
 src/mcd-master.h          |    2 --
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 380a5bf..6353de1 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -47,6 +47,7 @@
 #include "mcd-account-priv.h"
 #include "mcd-connection-priv.h"
 #include "mcd-dbusprop.h"
+#include "mcd-master-priv.h"
 #include "mcd-misc.h"
 
 #include "_gen/interfaces.h"
@@ -191,7 +192,7 @@ recover_connection (McdAccountManager *account_manager, gchar *file_contents,
     master = mcd_master_get_default ();
     g_return_val_if_fail (MCD_IS_MASTER (master), FALSE);
 
-    manager = mcd_master_lookup_manager (master, manager_name);
+    manager = _mcd_master_lookup_manager (master, manager_name);
     if (G_UNLIKELY (!manager))
     {
         DEBUG ("Manager %s not found", manager_name);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 5757d0e..a8832fc 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -562,7 +562,7 @@ load_manager (McdAccount *account)
 
     if (G_UNLIKELY (!priv->manager_name)) return FALSE;
     master = mcd_master_get_default ();
-    priv->manager = mcd_master_lookup_manager (master, priv->manager_name);
+    priv->manager = _mcd_master_lookup_manager (master, priv->manager_name);
     if (priv->manager)
     {
 	g_object_ref (priv->manager);
diff --git a/src/mcd-master-priv.h b/src/mcd-master-priv.h
index f113bd4..82dc279 100644
--- a/src/mcd-master-priv.h
+++ b/src/mcd-master-priv.h
@@ -39,5 +39,8 @@ void _mcd_master_get_nth_account_connection (McdMaster *master, gint i,
                                              McdAccountConnectionFunc *func,
                                              gpointer *userdata);
 
+McdManager *_mcd_master_lookup_manager (McdMaster *master,
+                                        const gchar *unique_name);
+
 G_END_DECLS
 #endif
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 6b526a9..2af2ccd 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -687,8 +687,8 @@ mcd_master_add_connection_parameter (McdMaster *master, const gchar *name,
     g_hash_table_replace (priv->extra_parameters, g_strdup (name), val);
 }
 
-/**
- * mcd_master_lookup_manager:
+/*
+ * _mcd_master_lookup_manager:
  * @master: the #McdMaster.
  * @unique_name: the name of the manager.
  *
@@ -699,8 +699,8 @@ mcd_master_add_connection_parameter (McdMaster *master, const gchar *name,
  * will stay alive as long as needed.
  */
 McdManager *
-mcd_master_lookup_manager (McdMaster *master,
-			   const gchar *unique_name)
+_mcd_master_lookup_manager (McdMaster *master,
+                            const gchar *unique_name)
 {
     const GList *managers, *list;
     McdManager *manager;
diff --git a/src/mcd-master.h b/src/mcd-master.h
index 6275dc9..71c1b9c 100644
--- a/src/mcd-master.h
+++ b/src/mcd-master.h
@@ -66,8 +66,6 @@ struct _McdMasterClass
 GType mcd_master_get_type (void);
 McdMaster *mcd_master_get_default (void);
 
-McdManager *mcd_master_lookup_manager (McdMaster *master,
-				       const gchar *unique_name);
 McdDispatcher *mcd_master_get_dispatcher (McdMaster *master);
 TpDBusDaemon *mcd_master_get_dbus_daemon (McdMaster *master);
 
-- 
1.5.6.5