diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-04-01 15:30:39 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:07 +0200 |
| commit | 1ffa61a4b3956d4af5770250a53b03991ac785fd (patch) | |
| tree | 4e7d2762d4aef7a084e04cfb7b8d1385e346bae5 /tubes/source/manager.cxx | |
| parent | d32927c8be569062b72f01ae7b938e5ad9f1078b (diff) | |
tubes: make conference hold a TpDBusTubeChannel
It already was, actually. :)
Diffstat (limited to 'tubes/source/manager.cxx')
| -rw-r--r-- | tubes/source/manager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 32589f10a9ae..2e0cd3e3023d 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -119,12 +119,12 @@ void TeleManager::DBusChannelHandler( SAL_INFO( "tubes", "TeleManager::DBusChannelHandler: incoming dbus channel: " << tp_channel_get_identifier( pChannel)); - if (tp_channel_get_channel_type_id( pChannel) == TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE) + if (TP_IS_DBUS_TUBE_CHANNEL( pChannel)) { SAL_INFO( "tubes", "accepting"); aAccepted = true; - TeleConferencePtr pConference( new TeleConference( pManager, pAccount, pChannel, "")); + TeleConferencePtr pConference( new TeleConference( pManager, pAccount, TP_DBUS_TUBE_CHANNEL( pChannel), "")); pManager->maConferences.push_back( pConference); pConference->acceptTube(); } @@ -283,7 +283,7 @@ static void TeleManager_ChannelReadyHandler( } pConference->setChannel( tp_account_channel_request_get_account( pChannelRequest), - pChannel); + TP_DBUS_TUBE_CHANNEL (pChannel)); pConference->offerTube(); } |