diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:44 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:44 +0800 |
| commit | b68b95efe92023193c318d4dd0fb92544463adef (patch) | |
| tree | a8299869c5f9203d294ebe2d0c7baaf4c1f96a91 /libempathy/empathy-tp-contact-factory.c | |
| parent | aec4141672783925d11bff56f9cd5019ef62c3c5 (diff) | |
| download | gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar.gz gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar.bz2 gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar.lz gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar.xz gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.tar.zst gsoc2013-empathy-b68b95efe92023193c318d4dd0fb92544463adef.zip | |
Merge commit 'sjoerd/master'
svn path=/trunk/; revision=637
Diffstat (limited to 'libempathy/empathy-tp-contact-factory.c')
| -rw-r--r-- | libempathy/empathy-tp-contact-factory.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index 77482522b..533f1c5b1 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -505,8 +505,7 @@ tp_contact_factory_update_capabilities (EmpathyTpContactFactory *tp_factory, capabilities = empathy_contact_get_capabilities (contact); if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) == 0) { - capabilities &= ~EMPATHY_CAPABILITIES_AUDIO; - capabilities &= ~EMPATHY_CAPABILITIES_VIDEO; + capabilities = EMPATHY_CAPABILITIES_NONE; if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) { capabilities |= EMPATHY_CAPABILITIES_AUDIO; } @@ -534,7 +533,9 @@ tp_contact_factory_get_capabilities_cb (DBusGProxy *proxy, if (error) { empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s", - error->message); + error->message); + /* FIXME Should set the capabilities of the contacts for which this request + * originated to NONE */ goto OUT; } |