diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 17:56:12 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 22:15:58 +0200 |
| commit | df2369657ebe36c3888bb032e693bf1fcb49bb51 (patch) | |
| tree | 9aaf358dde0a0b139cc8ea0738410fb144c1f772 /tubes/qa | |
| parent | 4eed899c596fdcb777ccb0a59c72718c6b2c295d (diff) | |
tubes: send file when inviting contact to MUC collaboration
- add UUID info to TeleConference
- let SendFile function take argument for contact instead of getting
contact from the channel info, what couldn't work for MUC channel
Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd
Diffstat (limited to 'tubes/qa')
| -rw-r--r-- | tubes/qa/test_manager.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index f914b3331033..ca03bae0ed08 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -264,7 +264,7 @@ void TestTeleTubes::testSendFile() /* This has to run after testContactList has run successfully. */ CPPUNIT_ASSERT( mpAccepterContact != 0); - mpConference1->sendFile( maTestConfigIniURL, + mpConference1->sendFile( mpAccepterContact, maTestConfigIniURL, &TestTeleTubes::FileSent, NULL); /* Waiting for event: FileSent quits the mainloop */ g_main_loop_run( mpMainLoop); |