[telepathy-mission-control/master] McdDispatcher: make contact-caps functions internal

[Simon McVittie]

---
 .../tmpl/mcd-dispatcher.sgml                       |   10 ----------
 src/mcd-connection.c                               |    6 +++---
 src/mcd-dispatcher.c                               |    7 ++++---
 src/mcd-dispatcher.h                               |    8 ++++----
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
index 5a5586f..0c3e74b 100644
--- a/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
+++ b/doc/reference/libmissioncontrol-server/tmpl/mcd-dispatcher.sgml
@@ -104,16 +104,6 @@ McdDispatcher
 @Returns: 
 
 
-<!-- ##### FUNCTION mcd_dispatcher_get_channel_capabilities ##### -->
-<para>
-
-</para>
-
- at dispatcher: 
- at protocol: 
- at Returns: 
-
-
 <!-- ##### FUNCTION mcd_dispatcher_add_filter ##### -->
 <para>
 
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 8d0ef8c..fdca181 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -661,8 +661,8 @@ _mcd_connection_setup_capabilities (McdConnection *connection)
 	return;
     }
     protocol_name = mcd_account_get_protocol_name (priv->account);
-    capabilities = mcd_dispatcher_get_channel_capabilities (priv->dispatcher,
-							    protocol_name);
+    capabilities = _mcd_dispatcher_get_channel_capabilities (priv->dispatcher,
+                                                             protocol_name);
     DEBUG ("advertising capabilities");
     tp_cli_connection_interface_capabilities_call_advertise_capabilities (priv->tp_conn, -1,
 									  capabilities,
@@ -699,7 +699,7 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
 	priv->got_contact_capabilities = TRUE;
 	return;
     }
-    contact_capabilities = mcd_dispatcher_get_channel_enhanced_capabilities
+    contact_capabilities = _mcd_dispatcher_get_channel_enhanced_capabilities
       (priv->dispatcher);
 
     DEBUG ("advertising capabilities");
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index d75695d..9f95c81 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -3066,8 +3066,9 @@ mcd_dispatcher_context_get_members (McdDispatcherContext * ctx)
     return NULL;
 }
 
-GPtrArray *mcd_dispatcher_get_channel_capabilities (McdDispatcher * dispatcher,
-						    const gchar *protocol)
+GPtrArray *
+_mcd_dispatcher_get_channel_capabilities (McdDispatcher *dispatcher,
+                                          const gchar *protocol)
 {
     McdDispatcherPrivate *priv = dispatcher->priv;
     McdDispatcherArgs args;
@@ -3112,7 +3113,7 @@ GPtrArray *mcd_dispatcher_get_channel_capabilities (McdDispatcher * dispatcher,
 }
 
 GPtrArray *
-mcd_dispatcher_get_channel_enhanced_capabilities (McdDispatcher * dispatcher)
+_mcd_dispatcher_get_channel_enhanced_capabilities (McdDispatcher *dispatcher)
 {
     McdDispatcherPrivate *priv = dispatcher->priv;
     GHashTableIter iter;
diff --git a/src/mcd-dispatcher.h b/src/mcd-dispatcher.h
index d433fbe..6d90b83 100644
--- a/src/mcd-dispatcher.h
+++ b/src/mcd-dispatcher.h
@@ -94,13 +94,13 @@ gint mcd_dispatcher_get_channel_type_usage (McdDispatcher * dispatcher,
 
 /* retrieves the channel handlers' capabilities, in a format suitable for being
  * used as a parameter for the telepathy "AdvertiseCapabilities" method */
-GPtrArray *mcd_dispatcher_get_channel_capabilities (McdDispatcher * dispatcher,
-						    const gchar *protocol);
+G_GNUC_INTERNAL GPtrArray *_mcd_dispatcher_get_channel_capabilities (
+    McdDispatcher *dispatcher, const gchar *protocol);
 
 /* retrieves the channel handlers' capabilities, in a format suitable for being
  * used as a parameter for the telepathy "SetSelfCapabilities" method */
-GPtrArray *mcd_dispatcher_get_channel_enhanced_capabilities (
-    McdDispatcher * dispatcher);
+G_GNUC_INTERNAL GPtrArray *_mcd_dispatcher_get_channel_enhanced_capabilities (
+    McdDispatcher *dispatcher);
 
 /* not exported */
 void _mcd_dispatcher_add_request (McdDispatcher *dispatcher,
-- 
1.5.6.5