diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:46 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-16 06:28:46 +0800 |
| commit | a17ae72f50370e70a8f231b4d24361d448402b20 (patch) | |
| tree | 4154058b33ae5f8048f6ffbf40b6d56a43d347ce /libempathy/empathy-tp-contact-factory.c | |
| parent | b68b95efe92023193c318d4dd0fb92544463adef (diff) | |
| download | gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.gz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.bz2 gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.lz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.xz gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.tar.zst gsoc2013-empathy-a17ae72f50370e70a8f231b4d24361d448402b20.zip | |
Cleanup code from previous merge
svn path=/trunk/; revision=638
Diffstat (limited to 'libempathy/empathy-tp-contact-factory.c')
| -rw-r--r-- | libempathy/empathy-tp-contact-factory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index 533f1c5b1..1cce6080c 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -505,7 +505,8 @@ 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_NONE; + capabilities &= ~EMPATHY_CAPABILITIES_AUDIO; + capabilities &= ~EMPATHY_CAPABILITIES_VIDEO; if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) { capabilities |= EMPATHY_CAPABILITIES_AUDIO; } @@ -533,7 +534,7 @@ 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; |