[Telepathy-commits] [telepathy-glib/master] Rename _register_with_contacts_iface to _register_with_contacts_mixin

[Sjoerd Simons]

---
 telepathy-glib/base-connection.c |    4 ++--
 telepathy-glib/base-connection.h |    2 +-
 telepathy-glib/presence-mixin.c  |    4 ++--
 telepathy-glib/presence-mixin.h  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index b65de30..d367ce3 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -1751,7 +1751,7 @@ tp_base_connection_fill_contact_attributes (GObject *obj,
 }
 
 /**
- * tp_base_connection_register_with_contacts_iface:
+ * tp_base_connection_register_with_contacts_mixin:
  * @self: An instance of the #TpBaseConnections that uses the Contacts
  * mixin
  *
@@ -1760,7 +1760,7 @@ tp_base_connection_fill_contact_attributes (GObject *obj,
  * is called
  */
 void
-tp_base_connection_register_with_contacts_iface (TpBaseConnection *self)
+tp_base_connection_register_with_contacts_mixin (TpBaseConnection *self)
 {
   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (self),
       TP_IFACE_CONNECTION,
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index aa9a3b3..cad945a 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -263,7 +263,7 @@ void tp_base_connection_add_interfaces (TpBaseConnection *self,
 void tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
     guint handle_type, const gchar **names, DBusGMethodInvocation *context);
 
-void tp_base_connection_register_with_contacts_iface (TpBaseConnection *self);
+void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *self);
 
 /* TYPE MACROS */
 #define TP_TYPE_BASE_CONNECTION \
diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c
index 925ae23..ec5d136 100644
--- a/telepathy-glib/presence-mixin.c
+++ b/telepathy-glib/presence-mixin.c
@@ -1375,7 +1375,7 @@ tp_presence_mixin_simple_presence_fill_contact_attributes (GObject *obj,
 }
 
 /**
- * tp_presence_mixin_simple_presence_register_with_contacts_iface:
+ * tp_presence_mixin_simple_presence_register_with_contacts_mixin:
  * @obj: An instance that of the implementation that uses both the Contacts
  * mixin and this mixin
  *
@@ -1384,7 +1384,7 @@ tp_presence_mixin_simple_presence_fill_contact_attributes (GObject *obj,
  * is called
  */
 void
-tp_presence_mixin_simple_presence_register_with_contacts_iface (GObject *obj)
+tp_presence_mixin_simple_presence_register_with_contacts_mixin (GObject *obj)
 {
   tp_contacts_mixin_add_contact_attributes_iface (obj,
       TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h
index caa7294..37ad7de 100644
--- a/telepathy-glib/presence-mixin.h
+++ b/telepathy-glib/presence-mixin.h
@@ -259,7 +259,7 @@ void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data);
 void tp_presence_mixin_simple_presence_iface_init (gpointer g_iface, gpointer iface_data);
 void tp_presence_mixin_simple_presence_init_dbus_properties (GObjectClass *cls);
 
-void tp_presence_mixin_simple_presence_register_with_contacts_iface (
+void tp_presence_mixin_simple_presence_register_with_contacts_mixin (
     GObject *obj);
 
 G_END_DECLS
-- 
1.5.6.3