[telepathy-mission-control/master] _mcd_dispatcher_get_channel_capabilities: remove unused @protocol argument

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Sep 21 04:10:41 PDT 2009


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

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 9570d7f..9a0c206 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -586,7 +586,6 @@ _mcd_connection_setup_capabilities (McdConnection *connection)
     McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
     GPtrArray *capabilities;
     const gchar *removed = NULL;
-    const gchar *protocol_name;
     GType type;
     guint i;
 
@@ -601,9 +600,7 @@ _mcd_connection_setup_capabilities (McdConnection *connection)
         DEBUG ("connection does not support capabilities interface");
 	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);
     DEBUG ("advertising capabilities");
     tp_cli_connection_interface_capabilities_call_advertise_capabilities (priv->tp_conn, -1,
 									  capabilities,
diff --git a/src/mcd-dispatcher-priv.h b/src/mcd-dispatcher-priv.h
index 23f492f..3592f74 100644
--- a/src/mcd-dispatcher-priv.h
+++ b/src/mcd-dispatcher-priv.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 /* retrieves the channel handlers' capabilities, in a format suitable for being
  * used as a parameter for the telepathy "AdvertiseCapabilities" method */
 G_GNUC_INTERNAL GPtrArray *_mcd_dispatcher_get_channel_capabilities (
-    McdDispatcher *dispatcher, const gchar *protocol);
+    McdDispatcher *dispatcher);
 
 /* retrieves the channel handlers' capabilities, in a format suitable for being
  * used as a parameter for the telepathy "SetSelfCapabilities" method */
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 83f7151..a8a8645 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -3476,8 +3476,7 @@ mcd_dispatcher_context_get_channel_by_type (McdDispatcherContext *context,
 }
 
 GPtrArray *
-_mcd_dispatcher_get_channel_capabilities (McdDispatcher *dispatcher,
-                                          const gchar *protocol)
+_mcd_dispatcher_get_channel_capabilities (McdDispatcher *dispatcher)
 {
     McdDispatcherPrivate *priv = dispatcher->priv;
     GPtrArray *channel_handler_caps;
-- 
1.5.6.5




More information about the telepathy-commits mailing list