aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-09-26 22:40:14 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-09-26 22:40:14 +0800
commitbf1079017d1d5d78147619a6377ef00e62010bf4 (patch)
treebc21b76975337150468c5a05f29bb5f03d5408e3
parent8d377a95ed24080b068ceffc3cb2d6d12ccb15e4 (diff)
downloadgsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar.gz
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar.bz2
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar.lz
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar.xz
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.tar.zst
gsoc2013-empathy-bf1079017d1d5d78147619a6377ef00e62010bf4.zip
Fix capabilities update, the NOT operator is ~ and not !
2007-09-26 Xavier Claessens <xclaesse@gmail.com> * libempathy/empathy-contact-factory.c: Fix capabilities update, the NOT operator is ~ and not ! svn path=/trunk/; revision=319
-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;
}