summaryrefslogtreecommitdiff
path: root/tubes
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-14 00:06:01 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-17 16:40:26 +0200
commitc8a6a1ff706600562bc08fe1dd490c149bbf8012 (patch)
treec2e1be6289aa7277bf354381e2f96a015d49dad5 /tubes
parentee956067d633f8e0b40e303e58c10bba42a0da85 (diff)
tubes: selectively export TeleManager's symbols
Change-Id: I70053c4b1e31ecd281701bab692764ef581e0f57
Diffstat (limited to 'tubes')
-rw-r--r--tubes/inc/tubes/manager.hxx29
1 files changed, 14 insertions, 15 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 79ab92b575c2..4e0e3b42bced 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -56,8 +56,7 @@ class TeleManagerImpl;
Accounts need to have been setup within Empathy already.
*/
-/* FIXME: selective dllprivate methods */
-class TUBES_DLLPUBLIC TeleManager
+class TeleManager
{
public:
@@ -79,14 +78,14 @@ public:
TeleManager( bool bCreateOwnGMainLoop = false );
~TeleManager();
- static TeleManager *get();
- void unref();
+ TUBES_DLLPUBLIC static TeleManager* get();
+ TUBES_DLLPUBLIC void unref();
/** Connect to DBus and create AccountManager. */
- bool createAccountManager();
+ TUBES_DLLPUBLIC bool createAccountManager();
/** Setup client handlers. */
- bool registerClients();
+ TUBES_DLLPUBLIC bool registerClients();
/** Prepare the Telepathy Account Manager.
Requires createAccountManager() to have succeeded.
@@ -96,13 +95,13 @@ public:
TODO: this needs some signalling mechanism
*/
- void prepareAccountManager();
- AccountManagerStatus getAccountManagerStatus() const;
+ TUBES_DLLPUBLIC void prepareAccountManager();
+ TUBES_DLLPUBLIC AccountManagerStatus getAccountManagerStatus() const;
/** Fetches the contact list. Returns 0 before connect() is called successfully.
Is non-functional until prepareAccountManager().
*/
- ContactList* getContactList() const;
+ TUBES_DLLPUBLIC ContactList* getContactList() const;
/** Start a group session in a MUC.
@@ -118,9 +117,9 @@ public:
empty, only the conference's UUID is used and rConferenceRoom is
ignored, hopefully resulting in a local DBus tube.
*/
- TeleConference* startGroupSession( TpAccount *pAccount,
- const rtl::OUString& rConferenceRoom,
- const rtl::OUString& rConferenceServer );
+ TUBES_DLLPUBLIC TeleConference* startGroupSession( TpAccount *pAccount,
+ const rtl::OUString& rConferenceRoom,
+ const rtl::OUString& rConferenceServer );
/** Start a session with a buddy.
@@ -130,7 +129,7 @@ public:
@param pBuddy
The buddy to be connected. Must be a contact of pAccount.
*/
- TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy );
+ TUBES_DLLPUBLIC TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy );
void disconnect();
@@ -219,11 +218,11 @@ private:
*/
static TeleManager* pSingleton;
static sal_uInt32 nAnotherRefCount;
- TUBES_DLLPRIVATE static ::osl::Mutex& GetAnotherMutex();
+ static ::osl::Mutex& GetAnotherMutex();
friend class TeleManagerImpl; // access to mutex
- TUBES_DLLPRIVATE static ::osl::Mutex& GetMutex();
+ static ::osl::Mutex& GetMutex();
};