diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-22 12:59:15 +0000 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:32 +0200 |
| commit | 066479973ce488b0cbf37cf409cd3616661b7943 (patch) | |
| tree | d2119c09ee9abb6cb0b2e13f1279128abc5aa375 /tubes/inc | |
| parent | ebc93773e9ec3436f2519651b42b69d39fe4e2e4 (diff) | |
tubes: make startBuddySession take a TpContact *.
I removed Conference::setTarget() because it's redundant: you can get
the target from the channel. And maTarget was unused anyway.
Diffstat (limited to 'tubes/inc')
| -rw-r--r-- | tubes/inc/tubes/conference.hxx | 3 | ||||
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 8f68333e940e..b9fd366604a8 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -71,8 +71,6 @@ public: // --- following only to be called only by manager's callbacks --- // TODO: make friends instead - /// "buddy@jabber.example.org" or "room@conference.example.org" or "UUID" - void setTarget( const rtl::OString& rTarget ); void setChannel( TpChannel* pChannel ); TpChannel* getChannel() const { return mpChannel; } bool offerTube(); @@ -92,7 +90,6 @@ public: private: - rtl::OString maTarget; rtl::OString maSessionId; TeleManager* mpManager; TpChannel* mpChannel; diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index c704780d2763..10f20ef2d546 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -105,15 +105,13 @@ public: /** Start a session with a buddy. - @param rAccount - The account (JID) to use. This must be a valid JID that has been - setup with Empathy or another Telepathy client providing - Jabber/XMPP. + @param pAccount + The account to use. This must be a valid Jabber account. - @param rBuddy + @param pBuddy The buddy to be connected. Must be a contact of rAccount. */ - bool startBuddySession( TpAccount *pAccount, const rtl::OString& rBuddy ); + bool startBuddySession( TpAccount *pAccount, TpContact *pBuddy); void unregisterConference( TeleConferencePtr pConference ); |