aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-13 22:06:12 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-14 20:59:29 +0800
commit398f69f13a9c9ee415fba5b1b393f27984b558bc (patch)
tree9ef5a1e43d008808dae88df3f99d60c4249687ac /libempathy
parent0fc14712b0e218d6ab5244eb995cc632d02f3b34 (diff)
downloadgsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar.gz
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar.bz2
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar.lz
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar.xz
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.tar.zst
gsoc2013-empathy-398f69f13a9c9ee415fba5b1b393f27984b558bc.zip
Claim that contacts support stream tube if it's announced in their contact capabilities
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-contact-factory.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index a9a02b176..ffd3087da 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -691,10 +691,10 @@ get_requestable_channel_classes_cb (TpProxy *connection,
* transfer if it's implemented in the CM */
if (priv->can_request_ft)
caps |= EMPATHY_CAPABILITIES_FT;
- }
- if (priv->can_request_st)
- caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+ if (priv->can_request_st)
+ caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+ }
empathy_contact_set_capabilities (contact, caps);
}
@@ -771,6 +771,9 @@ update_contact_capabilities (EmpathyTpContactFactory *self,
if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
capabilities |= EMPATHY_CAPABILITIES_FT;
+
+ if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
+ capabilities |= EMPATHY_CAPABILITIES_STREAM_TUBE;
}
DEBUG ("Changing capabilities for contact %s (%d) to %d",
@@ -829,11 +832,11 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
if (priv->can_request_ft) {
caps |= EMPATHY_CAPABILITIES_FT;
}
- }
- /* Set the Stream Tube capability */
- if (priv->can_request_st) {
- caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+ /* Set the Stream Tube capability */
+ if (priv->can_request_st) {
+ caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+ }
}
empathy_contact_set_capabilities (contact, caps);