diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-30 15:58:03 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:06 +0200 |
| commit | 226149126eae9911b5e7dc71567a8889051553d7 (patch) | |
| tree | 123fa422b77262d3d7770150c1f08e74666a2dda /tubes/inc | |
| parent | 055970730aa9752ab237cce9dfc3833cf28a4259 (diff) | |
tubes: reduce code duplication when opening connection
Diffstat (limited to 'tubes/inc')
| -rw-r--r-- | tubes/inc/tubes/conference.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 35812bb09cfc..f4ae973a7737 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -82,7 +82,6 @@ public: void setChannel( TpAccount* pAccount, TpChannel* pChannel ); TpChannel* getChannel() const { return mpChannel; } bool offerTube(); - bool setTube( DBusConnection* pTube ); bool acceptTube( const char* pAddress ); /// got tube accepted on other end as well? bool isTubeOpen() const { return meTubeChannelState == TP_TUBE_CHANNEL_STATE_OPEN; } @@ -96,9 +95,12 @@ public: { return mbTubeChannelStateChangedHandlerInvoked; } void setTubeChannelState( TpTubeChannelState eState ) { meTubeChannelState = eState; } + static void TubeOfferedHandler(TpChannel* pChannel, const gchar* pAddress, const GError* pError, + gpointer pUserData, GObject*pWeakObject); static void FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data); private: + bool setTube( const char* pTube ); rtl::OString maSessionId; TeleManager* mpManager; |