[Telepathy-commits] [telepathy-glib/master] ContactsMixin: Rename GetAttributeFunc to FilLContactAttributes

[Sjoerd Simons]

20080812093436-93b9a-502248b3596e69f323588abb866aa25f9ac33ffb.gz
---
 telepathy-glib/contacts-mixin.c |    4 ++--
 telepathy-glib/contacts-mixin.h |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/contacts-mixin.c b/telepathy-glib/contacts-mixin.c
index 92416b3..afa8f92 100644
--- a/telepathy-glib/contacts-mixin.c
+++ b/telepathy-glib/contacts-mixin.c
@@ -309,7 +309,7 @@ tp_contacts_mixin_get_contact_attributes (
 
   for (i = 0; interfaces[i] != NULL; i++)
     {
-      TpContactsMixinGetAttributesFunc func;
+      TpContactsMixinFillContactAttributesFunc func;
 
       func = g_hash_table_lookup (self->priv->interfaces, interfaces[i]);
 
@@ -361,7 +361,7 @@ tp_contacts_mixin_iface_init (gpointer g_iface, gpointer iface_data)
 
 void
 tp_contacts_mixin_add_inspectable_iface (GObject *obj, const gchar *interface,
-    TpContactsMixinGetAttributesFunc get_attributes)
+    TpContactsMixinFillContactAttributesFunc get_attributes)
 {
   TpContactsMixin *self = TP_CONTACTS_MIXIN (obj);
 
diff --git a/telepathy-glib/contacts-mixin.h b/telepathy-glib/contacts-mixin.h
index 1fdc7d9..ca79867 100644
--- a/telepathy-glib/contacts-mixin.h
+++ b/telepathy-glib/contacts-mixin.h
@@ -34,7 +34,7 @@ typedef struct _TpContactsMixin TpContactsMixin;
 typedef struct _TpContactsMixinPrivate TpContactsMixinPrivate;
 
 /**
- * TpContactsMixinGetAttributesFunc:
+ * TpContactsMixinFillContactAttributesFunc:
  * @obj: An object implementing the presence interface with this mixin
  * @contacts: The contacts for which attributes are requested
  * @attributes_hash: hash of handle => hash of attributes, containing all the
@@ -43,7 +43,7 @@ typedef struct _TpContactsMixinPrivate TpContactsMixinPrivate;
  * This function is called to add attributes of contacts
  *
  */
-typedef void (*TpContactsMixinGetAttributesFunc) (GObject *obj,
+typedef void (*TpContactsMixinFillContactAttributesFunc) (GObject *obj,
   const GArray *contacts, GHashTable *attributes_hash);
 
 /**
@@ -100,7 +100,8 @@ void tp_contacts_mixin_finalize (GObject *obj);
 void tp_contacts_mixin_iface_init (gpointer g_iface, gpointer iface_data);
 
 void tp_contacts_mixin_add_inspectable_iface (GObject *obj,
-    const gchar *interface, TpContactsMixinGetAttributesFunc get_attributes);
+    const gchar *interface,
+    TpContactsMixinFillContactAttributesFunc fill_attributes);
 
 void tp_contacts_mixin_set_contact_attribute (GHashTable *contact_attributes,
     TpHandle handle, gchar *attribute, GValue *value);
-- 
1.5.6.3