Service: rename "service-id" property to just "id"c2s

Consistency over all.

Tags: api

14 files changed, 20 insertions, 20 deletions

diff --git a/examples/dictionary-message.c b/examples/dictionary-message.c
index 81322bf..b57ee93 100644
--- a/examples/dictionary-message.c
+++ b/examples/dictionary-message.c
@@ -74,7 +74,7 @@ _client_roster_service_added (YtsRoster  *roster,
     NULL
   };
 
-  uid = yts_service_get_service_id (service);
+  uid = yts_service_get_id (service);
 
   if (0 == g_strcmp0 (uid, SERVER_UID)) {
 
diff --git a/examples/echo.c b/examples/echo.c
index 0d45423..d677223 100644
--- a/examples/echo.c
+++ b/examples/echo.c
@@ -68,7 +68,7 @@ _client_roster_service_added (YtsRoster  *roster,
 {
   char const *uid;
 
-  uid = yts_service_get_service_id (service);
+  uid = yts_service_get_id (service);
 
   if (0 == g_strcmp0 (uid, SERVER_UID)) {
 
@@ -159,7 +159,7 @@ _server_roster_service_added (YtsRoster  *roster,
 {
   char const *uid;
 
-  uid = yts_service_get_service_id (service);
+  uid = yts_service_get_id (service);
 
   g_debug ("%s() %s", __FUNCTION__, uid);
 
diff --git a/examples/status.c b/examples/status.c
index d8eb27c..3c56278 100644
--- a/examples/status.c
+++ b/examples/status.c
@@ -78,7 +78,7 @@ _client_roster_service_added (YtsRoster  *roster,
 {
   char const *uid;
 
-  uid = yts_service_get_service_id (service);
+  uid = yts_service_get_id (service);
 
   if (0 == g_strcmp0 (uid, SERVER_UID)) {
 
diff --git a/examples/video-profile/remote.c b/examples/video-profile/remote.c
index 0724df5..072310a 100644
--- a/examples/video-profile/remote.c
+++ b/examples/video-profile/remote.c
@@ -265,7 +265,7 @@ _roster_service_added (YtsRoster   *roster,
 {
   char const *uid;
 
-  uid = yts_service_get_service_id (service);
+  uid = yts_service_get_id (service);
 
   g_debug ("%s() %s", __FUNCTION__, uid);
 
diff --git a/tests/file-transfer.c b/tests/file-transfer.c
index f8a0388..f04599a 100644
--- a/tests/file-transfer.c
+++ b/tests/file-transfer.c
@@ -82,7 +82,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_id (contact);
-  const char  *sid     = yts_service_get_service_id (service);
+  const char  *sid     = yts_service_get_id (service);
 
   static YtsService *to = NULL;
 
diff --git a/tests/message-send.c b/tests/message-send.c
index f15cfc6..218fe9a 100644
--- a/tests/message-send.c
+++ b/tests/message-send.c
@@ -81,7 +81,7 @@ _dictionary_message (YtsClient          *client,
 static void
 service_added_cb (YtsRoster *roster, YtsService *service, YtsClient *client)
 {
-  const char  *sid     = yts_service_get_service_id (service);
+  const char  *sid     = yts_service_get_id (service);
   gboolean     our     = FALSE;
 
   static YtsService *service2 = NULL;
diff --git a/tests/status-set.c b/tests/status-set.c
index 2a96827..940ec78 100644
--- a/tests/status-set.c
+++ b/tests/status-set.c
@@ -67,7 +67,7 @@ service_added_cb (YtsRoster   *roster,
                   YtsService  *service,
                   YtsClient   *client)
 {
-  const char  *sid     = yts_service_get_service_id (service);
+  const char  *sid     = yts_service_get_id (service);
   gboolean     our     = FALSE;
 
   static YtsService *service2 = NULL;
diff --git a/ytstenut/yts-client.c b/ytstenut/yts-client.c
index aa6c9eb..a03ef8a 100644
--- a/ytstenut/yts-client.c
+++ b/ytstenut/yts-client.c
@@ -1212,7 +1212,7 @@ _roster_send_message (YtsRoster    *roster,
 {
   char const *service_id;
 
-  service_id = yts_service_get_service_id (service);
+  service_id = yts_service_get_id (service);
 
   yts_client_send_message (self, contact, service_id, message);
 }
diff --git a/ytstenut/yts-contact.c b/ytstenut/yts-contact.c
index 9c1f1c6..a66f4a7 100644
--- a/ytstenut/yts-contact.c
+++ b/ytstenut/yts-contact.c
@@ -253,7 +253,7 @@ _service_added (YtsContact  *self,
                 void        *data)
 {
   YtsContactPrivate *priv = GET_PRIVATE (self);
-  const char         *uid  = yts_service_get_service_id (service);
+  const char         *uid  = yts_service_get_id (service);
 
   g_return_if_fail (uid && *uid);
   g_return_if_fail (!g_hash_table_lookup (priv->services, uid));
@@ -272,7 +272,7 @@ _service_removed (YtsContact  *self,
                   void        *data)
 {
   YtsContactPrivate *priv = GET_PRIVATE (self);
-  const char         *uid  = yts_service_get_service_id (service);
+  const char         *uid  = yts_service_get_id (service);
 
   g_return_if_fail (uid && *uid);
 
@@ -878,7 +878,7 @@ yts_contact_add_service (YtsContact *self,
    * Emit the signal; the run-first signal closure will do the rest
    */
   g_message ("New service %s on %s",
-             yts_service_get_service_id (service),
+             yts_service_get_id (service),
              yts_contact_get_id (self));
 
   g_signal_emit (self, _signals[SIG_SERVICE_ADDED], 0, service);
diff --git a/ytstenut/yts-proxy-service-impl.c b/ytstenut/yts-proxy-service-impl.c
index 136cb73..69bfd11 100644
--- a/ytstenut/yts-proxy-service-impl.c
+++ b/ytstenut/yts-proxy-service-impl.c
@@ -70,7 +70,7 @@ yts_proxy_service_impl_new (char const        *service_id,
 
   return g_object_new (YTS_TYPE_PROXY_SERVICE_IMPL,
                        "fqc-ids", fqc_ids,
-                       "service-id", service_id,
+                       "id", service_id,
                        "type", type,
                        "names", names,
                        "statuses", statuses,
diff --git a/ytstenut/yts-service-impl.c b/ytstenut/yts-service-impl.c
index 23dd584..06c47e3 100644
--- a/ytstenut/yts-service-impl.c
+++ b/ytstenut/yts-service-impl.c
@@ -70,7 +70,7 @@ yts_service_impl_new (char const *service_id,
 
   return g_object_new (YTS_TYPE_SERVICE_IMPL,
                        "fqc-ids", fqc_ids,
-                       "service-id", service_id,
+                       "id", service_id,
                        "type", type,
                        "names", names,
                        "statuses", statuses,
diff --git a/ytstenut/yts-service.c b/ytstenut/yts-service.c
index 02583cf..84ee067 100644
--- a/ytstenut/yts-service.c
+++ b/ytstenut/yts-service.c
@@ -224,11 +224,11 @@ yts_service_class_init (YtsServiceClass *klass)
                                     "fqc-ids");
 
   /**
-   * YtsService:service-id:
+   * YtsService:id:
    *
    * The unique identifier of this service.
    */
-  pspec = g_param_spec_string ("service-id", "", "",
+  pspec = g_param_spec_string ("id", "", "",
                                NULL,
                                G_PARAM_READWRITE |
                                G_PARAM_CONSTRUCT_ONLY |
@@ -303,7 +303,7 @@ yts_service_init (YtsService *self)
 }
 
 /**
- * yts_service_get_service_id:
+ * yts_service_get_id:
  * @service: #YtsService
  *
  * Returns the unique id of the the given service.
@@ -311,7 +311,7 @@ yts_service_init (YtsService *self)
  * Return value: (transfer none): the service-id.
  */
 char const *
-yts_service_get_service_id (YtsService *self)
+yts_service_get_id (YtsService *self)
 {
   YtsServicePrivate *priv = GET_PRIVATE (self);
 
diff --git a/ytstenut/yts-service.h b/ytstenut/yts-service.h
index 8ec2630..9ef58d7 100644
--- a/ytstenut/yts-service.h
+++ b/ytstenut/yts-service.h
@@ -42,7 +42,7 @@ GType
 yts_service_get_type (void) G_GNUC_CONST;
 
 char const *
-yts_service_get_service_id (YtsService *self);
+yts_service_get_id (YtsService *self);
 
 char const *
 yts_service_get_service_type (YtsService *self);
diff --git a/ytstenut/ytstenut.sym b/ytstenut/ytstenut.sym
index 5e58c69..a4a1a7b 100644
--- a/ytstenut/ytstenut.sym
+++ b/ytstenut/ytstenut.sym
@@ -42,7 +42,7 @@ yts_proxy_service_get_type
 yts_roster_find_contact_by_id
 yts_roster_foreach_contact
 yts_roster_get_type
-yts_service_get_service_id
+yts_service_get_id
 yts_service_get_names
 yts_service_get_service_type
 yts_service_get_statuses