]> git.0d.be Git - empathy.git/commitdiff
use TP_PROP_* constants
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Apr 2010 08:37:27 +0000 (10:37 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 27 Apr 2010 07:54:17 +0000 (09:54 +0200)
libempathy/empathy-contact.c

index e8b38846f435208ebf5f8340e7f8a62badddd941..1d544d8e80bd784c3333dc63d3da78fa64ae3fc2 100644 (file)
@@ -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;
+            }
         }
     }