From 9ddd25f8589ae0cd5ec8e09c4c012e4ccac6a416 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 18 Aug 2011 11:31:10 +0200 Subject: Port to new tp-glib client factory - EmpathyChannelFactory has been changed to EmpathyClientFactory and inherit from TpAutomaticClientFactory. - We now always use the _with_am variant of TpSimple* constructors - We define our own factory as default. - Replace empathy_get_account_for_connection() by tp_connection_get_account() - The factory is passed to EmpathyTpChat and TpyCallChannel - Use tp_simple_client_factory_ensure_account() instead of tp_account_manager_ensure_account(). - Rely on the factory to prepare connection features. This should ensure that all the TpProxy and TpContact objects created in Empathy are shared and use EmpathyClientFactory. https://bugzilla.gnome.org/show_bug.cgi?id=655799 --- tests/empathy-chatroom-manager-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index b79e898d0..966027f38 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -109,7 +109,7 @@ START_TEST (test_empathy_chatroom_manager_dup_singleton) { "name1", "room1", TRUE, TRUE }, { "name2", "room2", FALSE, TRUE }}; - account_manager = empathy_account_manager_dup_singleton (); + account_manager = tp_account_manager_dup (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -143,7 +143,7 @@ START_TEST (test_empathy_chatroom_manager_add) { "name4", "room4", FALSE, FALSE }}; EmpathyChatroom *chatroom; - account_manager = empathy_account_manager_dup_singleton (); + account_manager = tp_account_manager_dup (); account = get_test_account (); @@ -203,7 +203,7 @@ START_TEST (test_empathy_chatroom_manager_remove) EmpathyChatroom *chatroom; EmpathyAccountManager *account_mgr; - account_mgr = empathy_account_manager_dup_singleton (); + account_mgr = tp_account_manager_dup (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -260,7 +260,7 @@ START_TEST (test_empathy_chatroom_manager_change_favorite) { "name2", "room2", FALSE, FALSE }}; EmpathyChatroom *chatroom; - account_manager = empathy_account_manager_dup_singleton (); + account_manager = tp_account_manager_dup (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -324,7 +324,7 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom) { "name2", "room2", FALSE, TRUE }}; EmpathyChatroom *chatroom; - account_manager = empathy_account_manager_dup_singleton (); + account_manager = tp_account_manager_dup (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, "foo.xml"); -- cgit v1.2.3