[next] telepathy-gabble: use TP_TOKEN_CONNECTION_*

[Guillaume Desmottes]

Module: telepathy-gabble
Branch: next
Commit: 5bc8afc646bb82eef8360c750b02fb8d15c2b8f6
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=5bc8afc646bb82eef8360c750b02fb8d15c2b8f6

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Oct 28 16:06:07 2013 +0100

use TP_TOKEN_CONNECTION_*

---

 src/conn-aliasing.c     |    2 +-
 src/conn-avatars.c      |    2 +-
 src/conn-client-types.c |    2 +-
 src/conn-contact-info.c |    2 +-
 src/conn-location.c     |    2 +-
 src/connection.c        |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 8dabfd3..30da0cf 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -1053,7 +1053,7 @@ conn_aliasing_fill_contact_attributes (GObject *obj,
       g_value_take_string (val, alias);
 
       tp_contacts_mixin_set_contact_attribute (attributes_hash,
-        handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING1"/alias",
+        handle, TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS,
         val);
 
       maybe_request_vcard (self, handle, source);
diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index 0ffad17..bac9715 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -612,7 +612,7 @@ conn_avatars_fill_contact_attributes (GObject *obj,
             g_value_set_string (val, "");
 
           tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
-            TP_IFACE_CONNECTION_INTERFACE_AVATARS1"/token", val);
+            TP_TOKEN_CONNECTION_INTERFACE_AVATARS1_TOKEN, val);
         }
     }
 }
diff --git a/src/conn-client-types.c b/src/conn-client-types.c
index 9fe8532..26f7fc1 100644
--- a/src/conn-client-types.c
+++ b/src/conn-client-types.c
@@ -148,7 +148,7 @@ conn_client_types_fill_contact_attributes (GObject *obj,
       val = tp_g_value_slice_new_take_boxed (G_TYPE_STRV, types);
 
       tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
-          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1 "/client-types", val);
+          TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES1_CLIENT_TYPES, val);
     }
 }
 
diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
index 8812a48..4574b75 100644
--- a/src/conn-contact-info.c
+++ b/src/conn-contact-info.c
@@ -1057,7 +1057,7 @@ conn_contact_info_fill_contact_attributes (GObject *obj,
                       TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
 
               tp_contacts_mixin_set_contact_attribute (attributes_hash,
-                      contact, TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1"/info",
+                      contact, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO1_INFO,
                       val);
             }
         }
diff --git a/src/conn-location.c b/src/conn-location.c
index 7250141..b152e94 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -622,7 +622,7 @@ conn_location_fill_contact_attributes (GObject *obj,
               TP_HASH_TYPE_STRING_VARIANT_MAP, location);
 
           tp_contacts_mixin_set_contact_attribute (attributes_hash,
-              handle, TP_IFACE_CONNECTION_INTERFACE_LOCATION1"/location", val);
+              handle, TP_TOKEN_CONNECTION_INTERFACE_LOCATION1_LOCATION, val);
         }
     }
 }
diff --git a/src/connection.c b/src/connection.c
index 1c1f25a..ece807c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -3429,7 +3429,7 @@ conn_contact_capabilities_fill_contact_attributes (GObject *obj,
 
       tp_contacts_mixin_set_contact_attribute (attributes_hash,
           handle,
-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1"/capabilities",
+          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1_CAPABILITIES,
           val);
     }
 }