← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/empathy/oneiric-proposed

« back to all changes in this revision

Viewing changes to tests/empathy-chatroom-manager-test.c

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2011-08-22 14:16:36 UTC
  • mfrom: (1.1.75 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822141636-iiju0fvx1f9sl3oz
Tags: 3.1.5.1-1ubuntu1
https://launchpad.net/bugs/829826
* New upstream version
  - crashed with SIGSEGV in dbus_connection_dispatch (LP: #829826)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/empathy-chatroom-manager-test.c
109
109
        { "name1", "room1", TRUE, TRUE },
110
110
        { "name2", "room2", FALSE, TRUE }};
111
111
 
112
 
  account_manager = empathy_account_manager_dup_singleton ();
 
112
  account_manager = tp_account_manager_dup ();
113
113
  account = get_test_account ();
114
114
 
115
115
  copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
143
143
        { "name4", "room4", FALSE, FALSE }};
144
144
  EmpathyChatroom *chatroom;
145
145
 
146
 
  account_manager = empathy_account_manager_dup_singleton ();
 
146
  account_manager = tp_account_manager_dup ();
147
147
 
148
148
  account = get_test_account ();
149
149
 
203
203
  EmpathyChatroom *chatroom;
204
204
  EmpathyAccountManager *account_mgr;
205
205
 
206
 
  account_mgr = empathy_account_manager_dup_singleton ();
 
206
  account_mgr = tp_account_manager_dup ();
207
207
  account = get_test_account ();
208
208
 
209
209
  copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
260
260
        { "name2", "room2", FALSE, FALSE }};
261
261
  EmpathyChatroom *chatroom;
262
262
 
263
 
  account_manager = empathy_account_manager_dup_singleton ();
 
263
  account_manager = tp_account_manager_dup ();
264
264
  account = get_test_account ();
265
265
 
266
266
  copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
324
324
        { "name2", "room2", FALSE, TRUE }};
325
325
  EmpathyChatroom *chatroom;
326
326
 
327
 
  account_manager = empathy_account_manager_dup_singleton ();
 
327
  account_manager = tp_account_manager_dup ();
328
328
  account = get_test_account ();
329
329
 
330
330
  copy_xml_file (CHATROOM_SAMPLE, "foo.xml");