aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libempathy/empathy-contact-factory.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a615f7ae..be7fd0a00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-09-26 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy/empathy-contact-factory.c: Fix capabilities update, the NOT
+ operator is ~ and not !
+
+2007-09-26 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-profile-chooser.c:
* libempathy-gtk/empathy-main-window.c: Fix warning when sort criterium
is NULL and when there is no profile. Fixes bug #479786
diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
index fe670e4e6..ec0d7bac8 100644
--- a/libempathy/empathy-contact-factory.c
+++ b/libempathy/empathy-contact-factory.c
@@ -396,8 +396,8 @@ contact_factory_update_capabilities (ContactFactoryAccountData *account_data,
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_AUDIO;
+ capabilities &= ~EMPATHY_CAPABILITIES_VIDEO;
if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) {
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
}