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/inc | |
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/inc')
-rw-r--r-- | tubes/inc/tubes/conference.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index fc495e5247d9..e5c5d370098b 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -66,7 +66,7 @@ public: boost::signals2::signal<void (const OString&)> sigPacketReceived; typedef void (*FileSentCallback)( bool aSuccess, void* pUserData); - TUBES_DLLPUBLIC void sendFile( rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData); + TUBES_DLLPUBLIC void sendFile( TpContact* pContact, rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData); TUBES_DLLPUBLIC const OString& getUuid() const { return msUuid; } // --- following only to be called only by manager's callbacks --- |