summaryrefslogtreecommitdiff
path: root/tubes/source
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-16 00:47:02 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-16 11:41:52 +0200
commit27861421a3b5f9045306195710a4c2b7bd1555ea (patch)
tree6af1e47cef0339ee16dd0caf0819db667468e6b6 /tubes/source
parentd59a7fda64d6bc773548b124a42c97df08b6ee3a (diff)
tubes: do not include tubes' object files in unit test library
Instead link against the library again. Unit test is now closer to what the real app looks like. Only 4 more functions exported because of unit test. Change-Id: I6fd784725564e577658d68ff7fe0595a79cf7639
Diffstat (limited to 'tubes/source')
-rw-r--r--tubes/source/collaboration.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/tubes/source/collaboration.cxx b/tubes/source/collaboration.cxx
index c957091cf042..a6e5ec09b760 100644
--- a/tubes/source/collaboration.cxx
+++ b/tubes/source/collaboration.cxx
@@ -42,12 +42,14 @@ void Collaboration::Invite( TpContact* pContact ) const
void Collaboration::SendFile( TpContact* pContact, const OUString& rURL ) const
{
- mpConference->sendFile( pContact, rURL, NULL, NULL );
+ if (mpConference)
+ mpConference->sendFile( pContact, rURL, NULL, NULL );
}
void Collaboration::SendPacket( const OString& rPacket ) const
{
- mpConference->sendPacket( rPacket );
+ if (mpConference)
+ mpConference->sendPacket( rPacket );
}
void Collaboration::SetConference( TeleConference* pConference )