Rename internal methods for consistency

diff --git a/libsignon-glib/signon-identity.c b/libsignon-glib/signon-identity.c
index ff32838..61fc0df 100644 (file)
--- a/libsignon-glib/signon-identity.c
+++ b/libsignon-glib/signon-identity.c
@@ -701,7 +701,7 @@ identity_methods_to_valuearray (const GHashTable *methods)
 {
     DEBUG ("%s", __func__);
     GHashTable *valuearray = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                g_free, (GDestroyNotify)signon_free_gvalue);
+                                                    g_free, signon_gvalue_free);
     g_hash_table_foreach ((GHashTable *)methods,
                             signon_stringarray_to_value, valuearray);
     return valuearray;

diff --git a/libsignon-glib/signon-utils.c b/libsignon-glib/signon-utils.c
index 751f62f..a4beeb2 100644 (file)
--- a/libsignon-glib/signon-utils.c
+++ b/libsignon-glib/signon-utils.c
@@ -23,7 +23,7 @@
  */
 #include "signon-utils.h"
 
-static void signon_copy_gvalue (gchar *key,
+static void signon_gvalue_copy (gchar *key,
                                 GValue *value,
                                 GHashTable *dest)
 {
@@ -34,7 +34,7 @@ static void signon_copy_gvalue (gchar *key,
     g_hash_table_insert (dest, g_strdup(key), copy_value);
 }
 
-void signon_free_gvalue (gpointer val)
+void signon_gvalue_free (gpointer val)
 {
     g_return_if_fail (G_IS_VALUE(val));
 
@@ -51,10 +51,10 @@ GHashTable *signon_copy_variant_map (const GHashTable *old_map)
     GHashTable *new_map = g_hash_table_new_full (g_str_hash,
                                                  g_str_equal,
                                                  g_free,
-                                                 signon_free_gvalue);
+                                                 signon_gvalue_free);
 
     g_hash_table_foreach ((GHashTable*)old_map,
-                          (GHFunc)signon_copy_gvalue,
+                          (GHFunc)signon_gvalue_copy,
                           (gpointer)new_map);
 
    return new_map;

diff --git a/libsignon-glib/signon-utils.h b/libsignon-glib/signon-utils.h
index 65dd349..8f4892e 100644 (file)
--- a/libsignon-glib/signon-utils.h
+++ b/libsignon-glib/signon-utils.h
@@ -31,6 +31,6 @@ GHashTable *signon_copy_variant_map (const GHashTable *old_map);
 G_GNUC_INTERNAL
 void signon_stringarray_to_value (gpointer key, gpointer value, gpointer user_data);
 G_GNUC_INTERNAL
-void signon_free_gvalue (gpointer val);
+void signon_gvalue_free (gpointer val);
 
 #endif //_SIGNON_UTILS_H_