summaryrefslogtreecommitdiff
path: root/tubes/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-06-30 12:52:57 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-17 16:40:19 +0200
commit8be626323e39d0cd8c073b6d17ae5e8181f12b1e (patch)
tree5c5a8459fdc553893e61437e563a08efbad37723 /tubes/inc
parent05c8c686a0c7dcbd58fac67a6a2c9b957f4159ad (diff)
tubes: make TeleManager::startGroupSession work and use it
Diffstat (limited to 'tubes/inc')
-rw-r--r--tubes/inc/tubes/manager.hxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index c780fd2467a7..326cc5191d22 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -101,9 +101,11 @@ public:
*/
ContactList* getContactList() const;
-#if 0
/** Start a group session in a MUC.
+ @param pAccount
+ The account to use. This must be a valid Jabber account.
+
@param rConferenceRoom
The MUC to be created/joined, e.g. "LibreOffice". If empty, the
conference's UUID is used.
@@ -113,9 +115,9 @@ public:
empty, only the conference's UUID is used and rConferenceRoom is
ignored, hopefully resulting in a local DBus tube.
*/
- bool startGroupSession( const rtl::OUString& rConferenceRoom,
+ bool startGroupSession( TpAccount *pAccount,
+ const rtl::OUString& rConferenceRoom,
const rtl::OUString& rConferenceServer );
-#endif
/** Start a session with a buddy.