diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 12:12:42 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 15:59:20 +0200 |
| commit | f86cc45d8795073e61d39edc469a4876085941b8 (patch) | |
| tree | 28e4edd40d2767fa8e1c5c0d77d56079b3a51af6 /tubes | |
| parent | bb9399e2cf0072d1de7cb0aea162d107ebde4360 (diff) | |
tubes: move mbChannelReadyHandlerInvoked to pImpl
Change-Id: If2ddd8bdcb11727be719e8966aa689fbabd94f44
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 6 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 163b58eb6228..9938f6f2313d 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -141,8 +141,8 @@ public: // Only for callbacks. void addConference( TeleConference* pConference ); - void setChannelReadyHandlerInvoked( bool b ) { mbChannelReadyHandlerInvoked = b; } - bool isChannelReadyHandlerInvoked() const { return mbChannelReadyHandlerInvoked; } + void setChannelReadyHandlerInvoked( bool b ); + bool isChannelReadyHandlerInvoked() const; void setAccountManagerReadyHandlerInvoked( bool b ); bool isAccountManagerReadyHandlerInvoked() const; @@ -189,8 +189,6 @@ public: private: void ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy ); - bool mbChannelReadyHandlerInvoked : 1; - static TeleManagerImpl* pImpl; static sal_uInt32 nRefCount; static rtl::OString aNameSuffix; diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index cfff455951c2..9fe6d4fb579f 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -90,7 +90,8 @@ public: TpBaseClient* mpFileTransferClient; TpAccountManager* mpAccountManager; TeleManager::AccountManagerStatus meAccountManagerStatus; - bool mbAccountManagerReadyHandlerInvoked; + bool mbAccountManagerReadyHandlerInvoked : 1; + bool mbChannelReadyHandlerInvoked : 1; ContactList* mpContactList; OString msCurrentUUID; typedef std::map< OString, TeleConference* > MapStringConference; @@ -383,8 +384,6 @@ static void TeleManager_AccountManagerReadyHandler( TeleManager::TeleManager() - : - mbChannelReadyHandlerInvoked( false) { SAL_INFO( "tubes", "TeleManager::get: count: " << nRefCount ); // The glib object types need to be initialized, else we aren't going @@ -734,12 +733,21 @@ void TeleManager::setAccountManagerReadyHandlerInvoked( bool b ) pImpl->mbAccountManagerReadyHandlerInvoked = b; } - bool TeleManager::isAccountManagerReadyHandlerInvoked() const { return pImpl->mbAccountManagerReadyHandlerInvoked; } +void TeleManager::setChannelReadyHandlerInvoked( bool b ) +{ + pImpl->mbChannelReadyHandlerInvoked = b; +} + +bool TeleManager::isChannelReadyHandlerInvoked() const +{ + return pImpl->mbChannelReadyHandlerInvoked; +} + ContactList* TeleManager::getContactList() const { return pImpl->mpContactList; @@ -902,7 +910,8 @@ TeleManagerImpl::TeleManagerImpl() mpFileTransferClient( NULL), mpAccountManager( NULL), meAccountManagerStatus( TeleManager::AMS_UNINITIALIZED), - mbAccountManagerReadyHandlerInvoked( false) + mbAccountManagerReadyHandlerInvoked( false), + mbChannelReadyHandlerInvoked( false) { } |