all: TpSimpleClientFactory has been renamed to TpClientFactory

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

7 files changed, 14 insertions, 14 deletions

diff --git a/telepathy-logger/call-channel-internal.h b/telepathy-logger/call-channel-internal.h
index a9e8a8c..0f7b9a9 100644
--- a/telepathy-logger/call-channel-internal.h
+++ b/telepathy-logger/call-channel-internal.h
@@ -68,7 +68,7 @@ TplCallChannel * _tpl_call_channel_new (TpConnection *conn,
     GError **error);
 
 TplCallChannel * _tpl_call_channel_new_with_factory (
-    TpSimpleClientFactory *factory,
+    TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *tp_chan_props,
diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c
index 90446d0..4afe893 100644
--- a/telepathy-logger/call-channel.c
+++ b/telepathy-logger/call-channel.c
@@ -459,7 +459,7 @@ _tpl_call_channel_new (TpConnection *conn,
 }
 
 TplCallChannel *
-_tpl_call_channel_new_with_factory (TpSimpleClientFactory *factory,
+_tpl_call_channel_new_with_factory (TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *tp_chan_props,
diff --git a/telepathy-logger/client-factory-internal.h b/telepathy-logger/client-factory-internal.h
index 9612c30..31c9db2 100644
--- a/telepathy-logger/client-factory-internal.h
+++ b/telepathy-logger/client-factory-internal.h
@@ -54,6 +54,6 @@ GType _tpl_client_factory_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TPL_TYPE_CLIENT_FACTORY, \
                               TplClientFactoryClass))
 
-TpSimpleClientFactory *_tpl_client_factory_new (TpDBusDaemon *dbus);
+TpClientFactory *_tpl_client_factory_new (TpDBusDaemon *dbus);
 
 #endif /* __TPL_CLIENT_FACTORY_H__ */
diff --git a/telepathy-logger/client-factory.c b/telepathy-logger/client-factory.c
index e698cc1..385cd99 100644
--- a/telepathy-logger/client-factory.c
+++ b/telepathy-logger/client-factory.c
@@ -30,11 +30,11 @@
 G_DEFINE_TYPE (TplClientFactory, _tpl_client_factory,
     TP_TYPE_AUTOMATIC_CLIENT_FACTORY)
 
-#define chainup ((TpSimpleClientFactoryClass *) \
+#define chainup ((TpClientFactoryClass *) \
     _tpl_client_factory_parent_class)
 
 static TpChannel *
-create_channel_impl (TpSimpleClientFactory *self,
+create_channel_impl (TpClientFactory *self,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *properties,
@@ -59,7 +59,7 @@ create_channel_impl (TpSimpleClientFactory *self,
 }
 
 static GArray *
-dup_channel_features_impl (TpSimpleClientFactory *self,
+dup_channel_features_impl (TpClientFactory *self,
     TpChannel *channel)
 {
   GArray *features;
@@ -89,13 +89,13 @@ _tpl_client_factory_init (TplClientFactory *self)
 static void
 _tpl_client_factory_class_init (TplClientFactoryClass *cls)
 {
-  TpSimpleClientFactoryClass *simple_class = (TpSimpleClientFactoryClass *) cls;
+  TpClientFactoryClass *factory_class = (TpClientFactoryClass *) cls;
 
-  simple_class->create_channel = create_channel_impl;
-  simple_class->dup_channel_features = dup_channel_features_impl;
+  factory_class->create_channel = create_channel_impl;
+  factory_class->dup_channel_features = dup_channel_features_impl;
 }
 
-TpSimpleClientFactory *
+TpClientFactory *
 _tpl_client_factory_new (TpDBusDaemon *dbus)
 {
   return g_object_new (TPL_TYPE_CLIENT_FACTORY,
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index 9c3bd9c..974f4c3 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -281,7 +281,7 @@ _tpl_observer_dup (GError **error)
     {
       GError *dbus_error = NULL;
       TpDBusDaemon *dbus = tp_dbus_daemon_dup (&dbus_error);
-      TpSimpleClientFactory *factory;
+      TpClientFactory *factory;
 
       if (dbus == NULL)
         {
@@ -292,7 +292,7 @@ _tpl_observer_dup (GError **error)
       factory = _tpl_client_factory_new (dbus);
 
       /* Pre-select feature to be initialized. */
-      tp_simple_client_factory_add_contact_features_varargs (factory,
+      tp_client_factory_add_contact_features_varargs (factory,
           TP_CONTACT_FEATURE_ALIAS,
           TP_CONTACT_FEATURE_PRESENCE,
           TP_CONTACT_FEATURE_AVATAR_TOKEN,
diff --git a/telepathy-logger/text-channel-internal.h b/telepathy-logger/text-channel-internal.h
index e6bb27f..f4f7db5 100644
--- a/telepathy-logger/text-channel-internal.h
+++ b/telepathy-logger/text-channel-internal.h
@@ -74,7 +74,7 @@ TplTextChannel * _tpl_text_channel_new (TpConnection *conn,
     GError **error);
 
 TplTextChannel * _tpl_text_channel_new_with_factory (
-    TpSimpleClientFactory *factory,
+    TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *tp_chan_props,
diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
index eb2ae7d..3b1f84d 100644
--- a/telepathy-logger/text-channel.c
+++ b/telepathy-logger/text-channel.c
@@ -698,7 +698,7 @@ _tpl_text_channel_new (TpConnection *conn,
 }
 
 TplTextChannel *
-_tpl_text_channel_new_with_factory (TpSimpleClientFactory *factory,
+_tpl_text_channel_new_with_factory (TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
     const GHashTable *tp_chan_props,