aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-21 16:37:27 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-04-27 15:54:17 +0800
commit857837c539058df84e398d482b24de3b71e2469a (patch)
tree02b4ec98c67f9a17af48d6c3a1cfed5e8bbec970
parent749997ed48b485fa703d4c417a4ee3224955fe6e (diff)
downloadgsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar.gz
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar.bz2
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar.lz
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar.xz
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.tar.zst
gsoc2013-empathy-857837c539058df84e398d482b24de3b71e2469a.zip
use TP_PROP_* constants
-rw-r--r--libempathy/empathy-contact.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index e8b38846f..1d544d8e8 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1418,12 +1418,12 @@ tp_caps_to_capabilities (TpCapabilities *caps)
&allowed_prop);
handle_type = tp_asv_get_uint32 (fixed_prop,
- TP_IFACE_CHANNEL ".TargetHandleType", NULL);
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL);
if (handle_type != TP_HANDLE_TYPE_CONTACT)
continue;
chan_type = tp_asv_get_string (fixed_prop,
- TP_IFACE_CHANNEL ".ChannelType");
+ TP_PROP_CHANNEL_CHANNEL_TYPE);
if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
{
@@ -1438,14 +1438,15 @@ tp_caps_to_capabilities (TpCapabilities *caps)
{
guint j;
- for (j = 0; allowed_prop[j] != NULL; j++) {
- if (!tp_strdiff (allowed_prop[j],
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio"))
- capabilities |= EMPATHY_CAPABILITIES_AUDIO;
- else if (!tp_strdiff (allowed_prop[j],
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo"))
- capabilities |= EMPATHY_CAPABILITIES_VIDEO;
- }
+ for (j = 0; allowed_prop[j] != NULL; j++)
+ {
+ if (!tp_strdiff (allowed_prop[j],
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO))
+ capabilities |= EMPATHY_CAPABILITIES_AUDIO;
+ else if (!tp_strdiff (allowed_prop[j],
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO))
+ capabilities |= EMPATHY_CAPABILITIES_VIDEO;
+ }
}
}