Reorder header inclusions accordingly to the Telepathy coding style

[empathy.git] / tests / empathy-chatroom-manager-test.c

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 3d6b6f6b7a8cd1b043cb2de23f01a36be800d390..323bbb98b9428941f6649854a66d9d1a9006b389 100644 (file)
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -2,14 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#include <telepathy-glib/telepathy-glib.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-chatroom-manager.h>
-
+#include "empathy-chatroom-manager.h"
 #include "test-helper.h"
 
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
@@ -78,7 +73,7 @@ check_chatrooms_list (EmpathyChatroomManager *mgr,
   fail_if (g_hash_table_size (found) != 0);
 
   g_list_free (chatrooms);
-  g_hash_table_destroy (found);
+  g_hash_table_unref (found);
 }
 
 static gboolean
@@ -111,7 +106,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);
@@ -145,7 +140,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 ();
 
@@ -205,7 +200,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);
@@ -262,7 +257,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);
@@ -326,7 +321,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");