From a17ae72f50370e70a8f231b4d24361d448402b20 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 15 Feb 2008 22:28:46 +0000 Subject: Cleanup code from previous merge svn path=/trunk/; revision=638 --- libempathy/empathy-tp-contact-factory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libempathy/empathy-tp-contact-factory.c') 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; -- cgit v1.2.3