[Telepathy-commits] [telepathy-mission-control/master] SetSelfCapabilities: remove uneeded parameter protocol

[Alban Crequy]

---
 src/mcd-connection.c |    4 +---
 src/mcd-dispatcher.c |    3 +--
 src/mcd-dispatcher.h |    3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 1c86b3b..2228081 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -521,7 +521,6 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
 {
     McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
     GPtrArray *contact_capabilities;
-    const gchar *protocol_name;
 
     if (!priv->has_contact_capabilities_if)
     {
@@ -529,9 +528,8 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
 	priv->got_contact_capabilities = TRUE;
 	return;
     }
-    protocol_name = mcd_account_get_protocol_name (priv->account);
     contact_capabilities = mcd_dispatcher_get_channel_enhanced_capabilities
-      (priv->dispatcher, protocol_name);
+      (priv->dispatcher);
 
     g_debug ("%s: advertising capabilities", G_STRFUNC);
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 50707bc..e5dfa93 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2848,8 +2848,7 @@ channel_classes_equals (GHashTable *channel_class1, GHashTable *channel_class2)
 }
 
 GPtrArray *
-mcd_dispatcher_get_channel_enhanced_capabilities (McdDispatcher * dispatcher,
-                                                  const gchar *protocol)
+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 0ae1d77..bc55f32 100644
--- a/src/mcd-dispatcher.h
+++ b/src/mcd-dispatcher.h
@@ -89,8 +89,7 @@ GPtrArray *mcd_dispatcher_get_channel_capabilities (McdDispatcher * dispatcher,
 /* 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,
-    const gchar *protocol);
+    McdDispatcher * dispatcher);
 
 /* not exported */
 void _mcd_dispatcher_add_request (McdDispatcher *dispatcher,
-- 
1.5.6.5