Contact: rename "contact-id" property to just "id"

Consistency over all.

Tags: api

6 files changed, 18 insertions, 18 deletions

diff --git a/tests/file-transfer.c b/tests/file-transfer.c
index f73afc8..f8a0388 100644
--- a/tests/file-transfer.c
+++ b/tests/file-transfer.c
@@ -81,7 +81,7 @@ service_added_cb (YtsRoster *roster, YtsService *service, gpointer data)
 {
   YtsClient  *client  = yts_roster_get_client (roster);
   YtsContact *contact = yts_service_get_contact (service);
-  const char  *jid     = yts_contact_get_contact_id (contact);
+  const char  *jid     = yts_contact_get_id (contact);
   const char  *sid     = yts_service_get_service_id (service);
 
   static YtsService *to = NULL;
diff --git a/ytstenut/profile/yts-profile-impl.c b/ytstenut/profile/yts-profile-impl.c
index e6043c6..6a5ecdc 100644
--- a/ytstenut/profile/yts-profile-impl.c
+++ b/ytstenut/profile/yts-profile-impl.c
@@ -98,7 +98,7 @@ _register_proxy (YtsProfile  *self,
       if (NULL == return_value) {
         g_critical ("%s : Failed to register proxy %s:%s for %s",
                     G_STRLOC,
-                    yts_contact_get_contact_id (contact),
+                    yts_contact_get_id (contact),
                     proxy_id,
                     capability);
         return_value = g_variant_new_boolean (false);
@@ -174,7 +174,7 @@ _unregister_proxy (YtsProfile  *self,
   if (!ret) {
     g_critical ("%s : Failed to unregister proxy %s:%s for %s",
                 G_STRLOC,
-                yts_contact_get_contact_id (contact),
+                yts_contact_get_id (contact),
                 proxy_id,
                 capability);
     yts_profile_unregister_proxy_return (self, invocation_id, false);
diff --git a/ytstenut/yts-client.c b/ytstenut/yts-client.c
index 94e95f4..aa6c9eb 100644
--- a/ytstenut/yts-client.c
+++ b/ytstenut/yts-client.c
@@ -521,7 +521,7 @@ yts_client_ft_accept_cb (TpProxy      *proxy,
 
   if ((item = yts_roster_find_contact_by_handle (priv->roster, ihandle)))
     {
-      jid = yts_contact_get_contact_id (item);
+      jid = yts_contact_get_id (item);
     }
   else
     {
@@ -585,7 +585,7 @@ yts_client_ft_handle_state (YtsClient *self, TpChannel *proxy, guint state)
           {
             if (item)
               g_message ("Got request for FT channel from %s (%s)",
-                         yts_contact_get_contact_id (item),
+                         yts_contact_get_id (item),
                          tp_proxy_get_bus_name (proxy));
             else
               g_message ("Got request for FT channel from handle %d",
@@ -619,7 +619,7 @@ yts_client_ft_handle_state (YtsClient *self, TpChannel *proxy, guint state)
 
             if (item)
               {
-                jid = yts_contact_get_contact_id (item);
+                jid = yts_contact_get_id (item);
 
                 name   = tp_asv_get_string (props, "Filename");
 
diff --git a/ytstenut/yts-contact.c b/ytstenut/yts-contact.c
index 7080332..9c1f1c6 100644
--- a/ytstenut/yts-contact.c
+++ b/ytstenut/yts-contact.c
@@ -72,7 +72,7 @@ enum {
 
 enum {
   PROP_0,
-  PROP_CONTACT_ID,
+  PROP_ID,
   PROP_NAME,
   PROP_TP_CONTACT,
 
@@ -138,7 +138,7 @@ yts_contact_ft_op_cb (EmpathyTpFile *tp_file,
     {
       e = (atom | YTS_ERROR_UNKNOWN);
       g_warning ("File transfer to %s failed: %s",
-                 yts_contact_get_contact_id (self), error->message);
+                 yts_contact_get_id (self), error->message);
     }
   else
     e = (atom | YTS_ERROR_SUCCESS);
@@ -293,9 +293,9 @@ _get_property (GObject    *object,
   YtsContactPrivate *priv = GET_PRIVATE (object);
 
   switch (property_id) {
-    case PROP_CONTACT_ID:
+    case PROP_ID:
       g_value_set_string (value,
-                          yts_contact_get_contact_id (YTS_CONTACT (object)));
+                          yts_contact_get_id (YTS_CONTACT (object)));
       break;
     case PROP_NAME:
       g_value_set_string (value,
@@ -374,14 +374,14 @@ yts_contact_class_init (YtsContactClass *klass)
   object_class->set_property = _set_property;
 
   /**
-   * YtsContact:contact-id:
+   * YtsContact:id:
    *
    * The JID of this contact.
    */
-  pspec = g_param_spec_string ("contact-id", "", "",
+  pspec = g_param_spec_string ("id", "", "",
                                NULL,
                                G_PARAM_READABLE);
-  g_object_class_install_property (object_class, PROP_CONTACT_ID, pspec);
+  g_object_class_install_property (object_class, PROP_ID, pspec);
 
   /**
    * YtsContact:name:
@@ -466,7 +466,7 @@ yts_contact_init (YtsContact *self)
 }
 
 /**
- * yts_contact_get_contact_id:
+ * yts_contact_get_id:
  * @self: object on which to invoke this method.
  *
  * Retrieves the jabber identifier of this contact.
@@ -474,7 +474,7 @@ yts_contact_init (YtsContact *self)
  * Returns: (transfer none): The JID of this contact.
  */
 const char *
-yts_contact_get_contact_id (YtsContact const *self)
+yts_contact_get_id (YtsContact const *self)
 {
   YtsContactPrivate *priv = GET_PRIVATE (self);
 
@@ -879,7 +879,7 @@ yts_contact_add_service (YtsContact *self,
    */
   g_message ("New service %s on %s",
              yts_service_get_service_id (service),
-             yts_contact_get_contact_id (self));
+             yts_contact_get_id (self));
 
   g_signal_emit (self, _signals[SIG_SERVICE_ADDED], 0, service);
 }
diff --git a/ytstenut/yts-contact.h b/ytstenut/yts-contact.h
index 410651f..2ed1758 100644
--- a/ytstenut/yts-contact.h
+++ b/ytstenut/yts-contact.h
@@ -43,7 +43,7 @@ GType
 yts_contact_get_type (void) G_GNUC_CONST;
 
 char const *
-yts_contact_get_contact_id (YtsContact const *self);
+yts_contact_get_id (YtsContact const *self);
 
 char const *
 yts_contact_get_name (YtsContact const *self);
diff --git a/ytstenut/ytstenut.sym b/ytstenut/ytstenut.sym
index a0300d1..5e58c69 100644
--- a/ytstenut/ytstenut.sym
+++ b/ytstenut/ytstenut.sym
@@ -18,7 +18,7 @@ yts_client_set_incoming_file_directory
 yts_client_set_status_by_capability
 yts_contact_cancel_file
 yts_contact_foreach_service
-yts_contact_get_contact_id
+yts_contact_get_id
 yts_contact_get_name
 yts_contact_get_type
 yts_contact_send_file