TpSimpleClientFactory has been renamed TpClientFactory

19 files changed, 53 insertions, 53 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 7dcd6e6..96bf4ea 100644
--- a/telepathy-logger/call-channel.c
+++ b/telepathy-logger/call-channel.c
@@ -458,7 +458,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 aa21158..f678d64 100644
--- a/telepathy-logger/client-factory-internal.h
+++ b/telepathy-logger/client-factory-internal.h
@@ -55,6 +55,6 @@ GType _tpl_client_factory_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TPL_TYPE_CLIENT_FACTORY, \
                               TplClientFactoryClass))
 
-TpSimpleClientFactory *_tpl_client_factory_dup (TpDBusDaemon *dbus);
+TpClientFactory *_tpl_client_factory_dup (TpDBusDaemon *dbus);
 
 #endif /* __TPL_CLIENT_FACTORY_H__ */
diff --git a/telepathy-logger/client-factory.c b/telepathy-logger/client-factory.c
index b3dd9fe..90be335 100644
--- a/telepathy-logger/client-factory.c
+++ b/telepathy-logger/client-factory.c
@@ -29,11 +29,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,
@@ -58,7 +58,7 @@ create_channel_impl (TpSimpleClientFactory *self,
 }
 
 static GArray *
-dup_channel_features_impl (TpSimpleClientFactory *self,
+dup_channel_features_impl (TpClientFactory *self,
     TpChannel *channel)
 {
   GArray *features;
@@ -88,14 +88,14 @@ _tpl_client_factory_init (TplClientFactory *self)
 static void
 _tpl_client_factory_class_init (TplClientFactoryClass *cls)
 {
-  TpSimpleClientFactoryClass *simple_class = (TpSimpleClientFactoryClass *) cls;
+  TpClientFactoryClass *simple_class = (TpClientFactoryClass *) cls;
 
   simple_class->create_channel = create_channel_impl;
   simple_class->dup_channel_features = dup_channel_features_impl;
 }
 
 
-static TpSimpleClientFactory *
+static TpClientFactory *
 _tpl_client_factory_new (TpDBusDaemon *dbus)
 {
   return g_object_new (TPL_TYPE_CLIENT_FACTORY,
@@ -103,10 +103,10 @@ _tpl_client_factory_new (TpDBusDaemon *dbus)
       NULL);
 }
 
-TpSimpleClientFactory *
+TpClientFactory *
 _tpl_client_factory_dup (TpDBusDaemon *dbus)
 {
-  static TpSimpleClientFactory *singleton = NULL;
+  static TpClientFactory *singleton = NULL;
 
   if (singleton != NULL)
     return g_object_ref (singleton);
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index ee3c353..1bc79f9 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -757,7 +757,7 @@ tpl_dbus_service_clear_account (TplSvcLogger *logger,
   TpDBusDaemon *bus;
   TpAccount *account;
   GError *error = NULL;
-  TpSimpleClientFactory *factory = NULL;
+  TpClientFactory *factory = NULL;
 
   g_return_if_fail (TPL_IS_DBUS_SERVICE (self));
   g_return_if_fail (context != NULL);
@@ -772,7 +772,7 @@ tpl_dbus_service_clear_account (TplSvcLogger *logger,
 
   factory = _tpl_client_factory_dup (bus);
 
-  account = tp_simple_client_factory_ensure_account (factory, account_path,
+  account = tp_client_factory_ensure_account (factory, account_path,
       NULL, &error);
   if (account == NULL)
     {
@@ -809,7 +809,7 @@ tpl_dbus_service_clear_entity (TplSvcLogger *logger,
   TpAccount *account;
   TplEntity *entity;
   GError *error = NULL;
-  TpSimpleClientFactory *factory = NULL;
+  TpClientFactory *factory = NULL;
 
   g_return_if_fail (TPL_IS_DBUS_SERVICE (self));
   g_return_if_fail (context != NULL);
@@ -825,7 +825,7 @@ tpl_dbus_service_clear_entity (TplSvcLogger *logger,
 
   factory = _tpl_client_factory_dup (bus);
 
-  account = tp_simple_client_factory_ensure_account (factory, account_path,
+  account = tp_client_factory_ensure_account (factory, account_path,
       NULL, &error);
   if (account == NULL)
     {
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index 02c0d1d..e05a2c2 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_dup (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 7402eb3..c69368f 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,
diff --git a/tests/dbus/test-entity.c b/tests/dbus/test-entity.c
index a0645fb..e49b5fd 100644
--- a/tests/dbus/test-entity.c
+++ b/tests/dbus/test-entity.c
@@ -61,8 +61,8 @@ ensure_contact_cb (GObject *source,
   Result *result = user_data;
   GError *error = NULL;
 
-  result->contact = tp_simple_client_factory_ensure_contact_by_id_finish (
-      TP_SIMPLE_CLIENT_FACTORY (source), op_result, &error);
+  result->contact = tp_client_factory_ensure_contact_by_id_finish (
+      TP_CLIENT_FACTORY (source), op_result, &error);
 
   g_assert_no_error (error);
   g_assert (TP_IS_CONTACT (result->contact));
@@ -83,7 +83,7 @@ test_entity_instantiation_from_tp_contact (void)
   Result result;
   TplEntity *entity;
   TpContact *alice, *bob;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
 
   tp_tests_create_and_connect_conn (TP_TESTS_TYPE_CONTACTS_CONNECTION,
       "me@test.com", &base_connection, &client_connection);
@@ -105,19 +105,19 @@ test_entity_instantiation_from_tp_contact (void)
       avatar_tokens);
 
   factory = tp_proxy_get_factory (client_connection);
-  tp_simple_client_factory_add_contact_features_varargs (factory,
+  tp_client_factory_add_contact_features_varargs (factory,
       TP_CONTACT_FEATURE_ALIAS,
       TP_CONTACT_FEATURE_AVATAR_TOKEN,
       TP_CONTACT_FEATURE_INVALID);
 
   result.loop = g_main_loop_new (NULL, FALSE);
 
-  tp_simple_client_factory_ensure_contact_by_id_async (factory,
+  tp_client_factory_ensure_contact_by_id_async (factory,
       client_connection, "alice", ensure_contact_cb, &result);
   g_main_loop_run (result.loop);
   alice = result.contact;
 
-  tp_simple_client_factory_ensure_contact_by_id_async (factory,
+  tp_client_factory_ensure_contact_by_id_async (factory,
       client_connection, "bob", ensure_contact_cb, &result);
   g_main_loop_run (result.loop);
   bob = result.contact;
diff --git a/tests/dbus/test-log-manager.c b/tests/dbus/test-log-manager.c
index 3a2bf3f..11edfb3 100644
--- a/tests/dbus/test-log-manager.c
+++ b/tests/dbus/test-log-manager.c
@@ -30,7 +30,7 @@ typedef struct
   TpDBusDaemon *dbus;
   TpAccount *account;
   TpTestsSimpleAccount *account_service;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
 
   GList *ret;
 
@@ -206,7 +206,7 @@ setup_service (TestCaseFixture* fixture,
 
   fixture->factory = _tpl_client_factory_dup (fixture->dbus);
 
-  fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+  fixture->account = tp_client_factory_ensure_account (fixture->factory,
       account_path, NULL, NULL);
   g_assert (fixture->account != NULL);
 
@@ -402,7 +402,7 @@ test_get_events_for_date_account_unprepared (TestCaseFixture *fixture,
   account_path = g_value_get_string (
       (const GValue *) g_hash_table_lookup (params, "account-path"));
 
-  account = tp_simple_client_factory_ensure_account (fixture->factory,
+  account = tp_client_factory_ensure_account (fixture->factory,
       account_path, NULL, NULL);
   g_assert (!tp_proxy_is_prepared (account, TP_ACCOUNT_FEATURE_CORE));
 
diff --git a/tests/dbus/test-tpl-log-iter-pidgin.c b/tests/dbus/test-tpl-log-iter-pidgin.c
index 5bff6d8..11e1b5e 100644
--- a/tests/dbus/test-tpl-log-iter-pidgin.c
+++ b/tests/dbus/test-tpl-log-iter-pidgin.c
@@ -22,7 +22,7 @@ typedef struct
   TplLogStore *store;
   TpAccount *account;
   TpDBusDaemon *bus;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
   TpTestsSimpleAccount *account_service;
 } PidginTestCaseFixture;
 
@@ -88,17 +88,17 @@ setup (PidginTestCaseFixture* fixture,
       account_path,
       fixture->account_service);
 
-  fixture->factory = tp_simple_client_factory_new (fixture->bus);
+  fixture->factory = tp_client_factory_new (fixture->bus);
   g_assert (fixture->factory != NULL);
 
-  fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+  fixture->account = tp_client_factory_ensure_account (fixture->factory,
       tp_asv_get_string (params, "account-path"),
       params,
       &error);
   g_assert_no_error (error);
   g_assert (fixture->account != NULL);
 
-  features = tp_simple_client_factory_dup_account_features (fixture->factory,
+  features = tp_client_factory_dup_account_features (fixture->factory,
       fixture->account);
 
   tp_proxy_prepare_async (fixture->account,
diff --git a/tests/dbus/test-tpl-log-iter-xml.c b/tests/dbus/test-tpl-log-iter-xml.c
index a8f865d..9053f7d 100644
--- a/tests/dbus/test-tpl-log-iter-xml.c
+++ b/tests/dbus/test-tpl-log-iter-xml.c
@@ -23,7 +23,7 @@ typedef struct
   TplLogStore *store;
   TpAccount *account;
   TpDBusDaemon *bus;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
   TpTestsSimpleAccount *account_service;
 } XmlTestCaseFixture;
 
@@ -49,7 +49,7 @@ setup (XmlTestCaseFixture* fixture,
       &error);
   g_assert_no_error (error);
 
-  fixture->factory = tp_simple_client_factory_new (fixture->bus);
+  fixture->factory = tp_client_factory_new (fixture->bus);
   g_assert (fixture->factory != NULL);
 
   tpl_test_create_and_prepare_account (fixture->bus, fixture->factory,
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 411860d..edd3ddb 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -35,7 +35,7 @@ typedef struct
   TpDBusDaemon *dbus;
   TpAccount *account;
   TpTestsSimpleAccount *account_service;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
 
   TplLogStorePidgin *store;
   TplEntity *room;
@@ -151,7 +151,7 @@ setup_service (PidginTestCaseFixture* fixture,
 
   fixture->factory = _tpl_client_factory_dup (fixture->dbus);
 
-  fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+  fixture->account = tp_client_factory_ensure_account (fixture->factory,
       account_path, NULL, NULL);
   g_assert (fixture->account != NULL);
 
diff --git a/tests/dbus/test-tpl-log-store-sqlite.c b/tests/dbus/test-tpl-log-store-sqlite.c
index f9a25e1..c65718a 100644
--- a/tests/dbus/test-tpl-log-store-sqlite.c
+++ b/tests/dbus/test-tpl-log-store-sqlite.c
@@ -11,7 +11,7 @@ main (int argc, char **argv)
   TpDBusDaemon *bus;
   TpAccount *account;
   GError *error = NULL;
-  TpSimpleClientFactory* factory;
+  TpClientFactory* factory;
 
   g_type_init ();
 
@@ -22,7 +22,7 @@ main (int argc, char **argv)
 
   factory = _tpl_client_factory_dup (bus);
 
-  account =  tp_simple_client_factory_ensure_account (factory,
+  account =  tp_client_factory_ensure_account (factory,
       TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/danielle_2emadeley_40collabora_2eco_2euk0",
       NULL, &error);
   g_assert_no_error (error);
diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
index e2bd4d8..22c6d9c 100644
--- a/tests/dbus/test-tpl-log-store-xml.c
+++ b/tests/dbus/test-tpl-log-store-xml.c
@@ -24,7 +24,7 @@ typedef struct
   gchar *tmp_basedir;
   TplLogStore *store;
   TpDBusDaemon *bus;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
 } XmlTestCaseFixture;
 
 
@@ -160,7 +160,7 @@ test_clear_account (XmlTestCaseFixture *fixture,
 
   tpl_log_manager_search_free (hits);
 
-  account = tp_simple_client_factory_ensure_account (fixture->factory,
+  account = tp_client_factory_ensure_account (fixture->factory,
       TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
       NULL, &error);
 
@@ -227,7 +227,7 @@ test_clear_entity (XmlTestCaseFixture *fixture,
 
   tpl_log_manager_search_free (hits);
 
-  account = tp_simple_client_factory_ensure_account (fixture->factory,
+  account = tp_client_factory_ensure_account (fixture->factory,
       TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
       NULL, &error);
 
@@ -877,13 +877,13 @@ test_exists (XmlTestCaseFixture *fixture,
   TplEntity *user2, *user3;
   GError *error = NULL;
 
-  account1 = tp_simple_client_factory_ensure_account (fixture->factory,
+  account1 = tp_client_factory_ensure_account (fixture->factory,
       TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
       NULL, &error);
   g_assert_no_error (error);
   g_assert (account1 != NULL);
 
-  account2 = tp_simple_client_factory_ensure_account (fixture->factory,
+  account2 = tp_client_factory_ensure_account (fixture->factory,
       TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/user_40collabora_2eco_2euk",
       NULL, &error);
   g_assert_no_error (error);
diff --git a/tests/dbus/test-tpl-log-walker.c b/tests/dbus/test-tpl-log-walker.c
index d8b5b9f..b924a12 100644
--- a/tests/dbus/test-tpl-log-walker.c
+++ b/tests/dbus/test-tpl-log-walker.c
@@ -24,7 +24,7 @@ typedef struct
   TplLogManager *manager;
   TpAccount *account;
   TpDBusDaemon *bus;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
   TpTestsSimpleAccount *account_service;
 } WalkerTestCaseFixture;
 
@@ -88,17 +88,17 @@ setup (WalkerTestCaseFixture* fixture,
       account_path,
       fixture->account_service);
 
-  fixture->factory = tp_simple_client_factory_new (fixture->bus);
+  fixture->factory = tp_client_factory_new (fixture->bus);
   g_assert (fixture->factory != NULL);
 
-  fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+  fixture->account = tp_client_factory_ensure_account (fixture->factory,
       tp_asv_get_string (params, "account-path"),
       params,
       &error);
   g_assert_no_error (error);
   g_assert (fixture->account != NULL);
 
-  features = tp_simple_client_factory_dup_account_features (fixture->factory,
+  features = tp_client_factory_dup_account_features (fixture->factory,
       fixture->account);
 
   tp_proxy_prepare_async (fixture->account,
diff --git a/tests/lib/logger-test-helper.c b/tests/lib/logger-test-helper.c
index 6c5a59b..fd20baf 100644
--- a/tests/lib/logger-test-helper.c
+++ b/tests/lib/logger-test-helper.c
@@ -28,7 +28,7 @@
 
 void
 tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
-    TpSimpleClientFactory *factory,
+    TpClientFactory *factory,
     const gchar *path,
     TpAccount **account,
     TpTestsSimpleAccount **account_service)
@@ -43,12 +43,12 @@ tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
 
   tp_dbus_daemon_register_object (dbus, path, *account_service);
 
-  *account = tp_simple_client_factory_ensure_account (factory, path, NULL,
+  *account = tp_client_factory_ensure_account (factory, path, NULL,
       &error);
   g_assert_no_error (error);
   g_assert (*account != NULL);
 
-  features = tp_simple_client_factory_dup_account_features (factory, *account);
+  features = tp_client_factory_dup_account_features (factory, *account);
   g_array_append_val (features, zero);
 
   tp_tests_proxy_run_until_prepared (*account, (GQuark *) features->data);
diff --git a/tests/lib/logger-test-helper.h b/tests/lib/logger-test-helper.h
index 91f27b4..cb836f2 100644
--- a/tests/lib/logger-test-helper.h
+++ b/tests/lib/logger-test-helper.h
@@ -26,7 +26,7 @@
 #include "simple-account.h"
 
 void tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
-    TpSimpleClientFactory *factory,
+    TpClientFactory *factory,
     const gchar *path,
     TpAccount **account,
     TpTestsSimpleAccount **account_service);
diff --git a/tests/lib/util.c b/tests/lib/util.c
index 6fd7b1b..51dc5f2 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -204,7 +204,7 @@ tp_tests_create_conn (GType conn_type,
     TpConnection **client_conn)
 {
   TpDBusDaemon *dbus;
-  TpSimpleClientFactory *factory;
+  TpClientFactory *factory;
   gchar *name;
   gchar *conn_path;
   GError *error = NULL;
@@ -213,7 +213,7 @@ tp_tests_create_conn (GType conn_type,
   g_assert (client_conn != NULL);
 
   dbus = tp_tests_dbus_daemon_dup_or_die ();
-  factory = (TpSimpleClientFactory *) tp_automatic_client_factory_new (dbus);
+  factory = (TpClientFactory *) tp_automatic_client_factory_new (dbus);
 
   *service_conn = tp_tests_object_new_static_class (
         conn_type,
@@ -226,7 +226,7 @@ tp_tests_create_conn (GType conn_type,
         &name, &conn_path, &error));
   g_assert_no_error (error);
 
-  *client_conn = tp_simple_client_factory_ensure_connection (factory,
+  *client_conn = tp_client_factory_ensure_connection (factory,
       conn_path, NULL, &error);
   g_assert (*client_conn != NULL);
   g_assert_no_error (error);