summaryrefslogtreecommitdiff
path: root/salut
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-10-28 18:11:47 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-10-28 18:46:33 +0100
commitf616c0e05510f286bcac6adeb1fae57a7ae3ea1c (patch)
treef7dbd81fb02c01754807199d4110821f3c2d0bb9 /salut
parentbe1d2064ee3ff01342655610aa5a4052c253091c (diff)
ft-manager: remove forcibly adding FT channel class to self contact caps
If we stop at this point, specific FT services won't be added to the self handle's contact caps. It's also completely unnecessary to special case this. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'salut')
-rw-r--r--salut/src/ft-manager.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/salut/src/ft-manager.c b/salut/src/ft-manager.c
index 07ef93715..19c27acc1 100644
--- a/salut/src/ft-manager.c
+++ b/salut/src/ft-manager.c
@@ -661,17 +661,6 @@ salut_ft_manager_get_contact_caps_from_set (
const GabbleCapabilitySet *caps,
GPtrArray *arr)
{
- SalutFtManager *self = SALUT_FT_MANAGER (iface);
- SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
- TpBaseConnection *base = TP_BASE_CONNECTION (priv->connection);
-
- if (handle == base->self_handle)
- {
- /* we currently always advertise FT ourselves */
- add_file_transfer_channel_class (arr, TRUE, NULL);
- return;
- }
-
/* If we don't receive any capabilities info (QUIRK_NOT_XEP_CAPABILITIES)
* we assume FT is supported to ensure interoperability with other clients */
if (gabble_capability_set_has (caps, WOCKY_XMPP_NS_IQ_OOB) ||