diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 20:12:57 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 22:51:36 +0200 |
| commit | ee1b41dcc2fd00c9b45c7a7a7e2357c2c9c23ed5 (patch) | |
| tree | 7c5af0821df10b22723b11e32a7f1ff9ff732bfb /tubes | |
| parent | tubes: remove unused parameter (diff) | |
| download | core-ee1b41dcc2fd00c9b45c7a7a7e2357c2c9c23ed5.tar.gz core-ee1b41dcc2fd00c9b45c7a7a7e2357c2c9c23ed5.zip | |
tubes: avoid ugly SAL_DLLPUBLIC_EXPORT here
Change-Id: Icd839cd70dd32f766ad52d74fcf3cff28281da7e
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/source/conference.cxx | 10 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index 76fb0ae5b750..6203685a5b1b 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -526,11 +526,19 @@ static void TeleConference_FTReady( EmpathyFTHandler *handler, GError *error, gp } } - +// TODO: move sending file to TeleManager +extern void TeleManager_fileReceived( const OUString& ); void TeleConference::sendFile( TpContact* pContact, rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData) { INFO_LOGGER( "TeleConference::sendFile"); + if (!pContact) + { + // used in demo mode + TeleManager_fileReceived( localUri ); + return; + } + SAL_WARN_IF( ( !mpAccount || !mpChannel), "tubes", "can't send a file before the tube is set up"); if ( !mpAccount || !mpChannel) diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index e8368df62305..6c9007ad72b9 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -249,8 +249,8 @@ void TeleManager::setCurrentUuid( const OString& rUuid ) pImpl->msCurrentUUID = rUuid; } -// FIXME this is exported only because of ScDocFuncDemo -SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const rtl::OUString &rStr ) +// FIXME: should be static and not used in conference.cxx +void TeleManager_fileReceived( const rtl::OUString &rStr ) { SAL_INFO( "tubes", "TeleManager_fileReceived: incoming file: " << rStr ); @@ -291,7 +291,7 @@ SAL_DLLPUBLIC_EXPORT void TeleManager_fileReceived( const rtl::OUString &rStr ) } } -void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer ) +static void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferChannel *, gpointer ) { SAL_INFO( "tubes", "TeleManager_TransferDone: hooray!"); GFile *gfile = empathy_ft_handler_get_gfile( handler); |