[Telepathy-commits] [telepathy-gabble/master] Since I moved functions in caps-hash.c, change functions prefix to caps_hash

[Alban Crequy]

20080512160013-a41c0-45eff4f7701fa08e16c12899d373aa92d6f4b07e.gz
---
 src/caps-hash.c         |   10 +++++-----
 src/caps-hash.h         |    4 ++--
 src/gabble-connection.c |    6 +++---
 src/presence-cache.c    |    3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/caps-hash.c b/src/caps-hash.c
index e47071f..dfb46d2 100644
--- a/src/caps-hash.c
+++ b/src/caps-hash.c
@@ -119,7 +119,7 @@ gabble_presence_free_xep0115_hash (
 }
 
 static gchar *
-gabble_presence_compute_xep0115_hash (
+caps_hash_compute (
     GPtrArray *features,
     GPtrArray *identities,
     GPtrArray *dataforms)
@@ -191,7 +191,7 @@ gabble_presence_compute_xep0115_hash (
  * Returns: the hash. The called must free the returned hash with g_free().
  */
 gchar *
-gabble_presence_compute_xep0115_hash_from_lm_node (LmMessageNode *node)
+caps_hash_compute_from_lm_node (LmMessageNode *node)
 {
   GPtrArray *features = g_ptr_array_new ();
   GPtrArray *identities = g_ptr_array_new ();
@@ -326,7 +326,7 @@ gabble_presence_compute_xep0115_hash_from_lm_node (LmMessageNode *node)
         }
     }
 
-  str = gabble_presence_compute_xep0115_hash (features, identities, dataforms);
+  str = caps_hash_compute (features, identities, dataforms);
 
   gabble_presence_free_xep0115_hash (features, identities, dataforms);
 
@@ -340,7 +340,7 @@ gabble_presence_compute_xep0115_hash_from_lm_node (LmMessageNode *node)
  * Returns: the hash. The called must free the returned hash with g_free().
  */
 gchar *
-gabble_presence_compute_xep0115_hash_from_self_presence (GabbleConnection *self)
+caps_hash_compute_from_self_presence (GabbleConnection *self)
 {
   GabblePresence *presence = self->self_presence;
   GSList *features_list = capabilities_get_features (presence->caps);
@@ -363,7 +363,7 @@ gabble_presence_compute_xep0115_hash_from_self_presence (GabbleConnection *self)
 
   /* Gabble does not use dataforms, let 'dataforms' be empty */
 
-  str = gabble_presence_compute_xep0115_hash (features, identities, dataforms);
+  str = caps_hash_compute (features, identities, dataforms);
 
   gabble_presence_free_xep0115_hash (features, identities, dataforms);
   g_slist_free (features_list);
diff --git a/src/caps-hash.h b/src/caps-hash.h
index cc9c3c4..019710e 100644
--- a/src/caps-hash.h
+++ b/src/caps-hash.h
@@ -24,8 +24,8 @@
 #include <loudmouth/loudmouth.h>
 #include "gabble-connection.h"
 
-gchar *gabble_presence_compute_xep0115_hash_from_lm_node (LmMessageNode *node);
-gchar *gabble_presence_compute_xep0115_hash_from_self_presence (
+gchar *caps_hash_compute_from_lm_node (LmMessageNode *node);
+gchar *caps_hash_compute_from_self_presence (
     GabbleConnection *self);
 
 #endif /* __CAPS_HASH_H__ */
diff --git a/src/gabble-connection.c b/src/gabble-connection.c
index bcc366f..c0f0c10 100644
--- a/src/gabble-connection.c
+++ b/src/gabble-connection.c
@@ -1327,7 +1327,7 @@ _gabble_connection_signal_own_presence (GabbleConnection *self, GError **error)
   g_hash_table_destroy (bundles);
 
   /* XEP-0115 version 1.5 uses a verification string in the 'ver' attribute */
-  caps_hash = gabble_presence_compute_xep0115_hash_from_self_presence (self);
+  caps_hash = caps_hash_compute_from_self_presence (self);
   node = lm_message_node_add_child (node, "c", NULL);
   lm_message_node_set_attributes (
     node,
@@ -1508,7 +1508,7 @@ connection_iq_disco_cb (LmMessageHandler *handler,
 
   /* Every entity MUST have at least one identity (XEP-0030). Gabble publishs
    * one identity. If you change the identity here, you also need to change
-   * gabble_presence_compute_xep0115_hash_from_self_presence(). */
+   * caps_hash_compute_from_self_presence(). */
   identity = lm_message_node_add_child
       (result_query, "identity", NULL);
   lm_message_node_set_attribute (identity, "category", "client");
@@ -1535,7 +1535,7 @@ connection_iq_disco_cb (LmMessageHandler *handler,
         }
     }
 
-  caps_hash = gabble_presence_compute_xep0115_hash_from_self_presence (self);
+  caps_hash = caps_hash_compute_from_self_presence (self);
   DEBUG ("caps_hash='%s'", caps_hash);
   if (NULL == node || bundle_found ||
       g_str_equal (suffix, caps_hash))
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 1eb54ae..c9d77b2 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -826,8 +826,7 @@ _caps_disco_cb (GabbleDisco *disco,
     {
       const gchar *computed_hash;
 
-      computed_hash =
-          gabble_presence_compute_xep0115_hash_from_lm_node (query_result);
+      computed_hash = caps_hash_compute_from_lm_node (query_result);
 
       if (! g_str_equal (waiter_self->ver, computed_hash))
         {
-- 
1.5.6.3