diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-23 08:53:21 +0000 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:39 +0200 |
commit | e6a3874108e77d366085a4b275ac337cda5225ea (patch) | |
tree | 450026e4761086757d3f98747c8438cb800a40de /tubes/inc | |
parent | 0b7f8fb6971ca1df6f94508e45c42cdb157e3dab (diff) |
tubes: implement receiving files.
Diffstat (limited to 'tubes/inc')
-rw-r--r-- | tubes/inc/tubes/conference.hxx | 2 | ||||
-rw-r--r-- | tubes/inc/tubes/file-transfer-helper.h | 3 | ||||
-rw-r--r-- | tubes/inc/tubes/manager.hxx | 9 |
3 files changed, 14 insertions, 0 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 7428bcb33a48..7c5fd30bd994 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -94,6 +94,8 @@ public: { return mbTubeChannelStateChangedHandlerInvoked; } void setTubeChannelState( TpTubeChannelState eState ) { meTubeChannelState = eState; } + static void FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data); + private: rtl::OString maSessionId; diff --git a/tubes/inc/tubes/file-transfer-helper.h b/tubes/inc/tubes/file-transfer-helper.h index fe0678f84eee..8960d147969b 100644 --- a/tubes/inc/tubes/file-transfer-helper.h +++ b/tubes/inc/tubes/file-transfer-helper.h @@ -90,6 +90,9 @@ void empathy_ft_handler_new_outgoing ( gint64 action_time, EmpathyFTHandlerReadyCallback callback, gpointer user_data); +void empathy_ft_handler_set_service_name ( + EmpathyFTHandler *self, + const gchar *service_name); void empathy_ft_handler_new_incoming (TpFileTransferChannel *channel, EmpathyFTHandlerReadyCallback callback, diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 97f5de86fa19..0d2ef3eec745 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -140,6 +140,9 @@ public: void sendFile( rtl::OUString &localUri, TeleConference::FileSentCallback pCallback, void* pUserData); + typedef void (*FileReceivedCallback)( rtl::OUString &localUri, void* pUserData ); + void setFileReceivedCallback( FileReceivedCallback callback, void* pUserData ); + /// Only for use with MainLoopFlusher GMainLoop* getMainLoop() const; @@ -197,6 +200,9 @@ public: TpAccount* getAccount( const rtl::OString& rAccountID ); +/* Callbacks; not for use outside this class. */ + static void TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer user_data); + private: TeleConferenceVector maConferences; @@ -207,6 +213,9 @@ private: static sal_uInt32 nRefCount; static rtl::OString aNameSuffix; + FileReceivedCallback mpFileReceivedCallback; + void *mpFileReceivedCallbackData; + friend class TeleManagerImpl; // access to mutex TUBES_DLLPRIVATE static ::osl::Mutex& GetMutex(); |