summaryrefslogtreecommitdiff
path: root/tubes/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-23 16:20:48 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-23 21:43:51 +0200
commit955bbbb54c153dc50daca1f35d738acfe1d823a5 (patch)
tree712c7b4abe1052990c2076e0c6b42c4c24f06fa8 /tubes/inc
parenta83d916085350cd44dc2d0f575f3a6833404abb0 (diff)
tubes: get local callbacks out of class
Change-Id: I7e43d9990827c4c7d86d947e7d71a94b686642fc
Diffstat (limited to 'tubes/inc')
-rw-r--r--tubes/inc/tubes/conference.hxx15
-rw-r--r--tubes/inc/tubes/manager.hxx13
2 files changed, 3 insertions, 25 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index ab6db925b0fd..89544578eeed 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -71,6 +71,7 @@ public:
typedef void (*FileSentCallback)( bool aSuccess, void* pUserData);
TUBES_DLLPUBLIC void sendFile( rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData);
TUBES_DLLPUBLIC const OString& getUuid() const { return msUuid; }
+ void setUuid( const OString& rUuid ) { msUuid = rUuid; }
// --- following only to be called only by manager's callbacks ---
// TODO: make friends instead
@@ -79,6 +80,7 @@ public:
TpDBusTubeChannel* getChannel() const { return mpChannel; }
bool offerTube();
bool acceptTube();
+ bool setTube( GDBusConnection* pTube );
/// got tube accepted on other end as well?
bool isTubeOpen() const { return mpTube != NULL; }
@@ -86,22 +88,9 @@ public:
void setTubeOfferedHandlerInvoked( bool b ) { mbTubeOfferedHandlerInvoked = b; }
bool isTubeOfferedHandlerInvoked() const { return mbTubeOfferedHandlerInvoked; }
- static void TubeOfferedHandler(GObject* pSource, GAsyncResult* pResult, gpointer pUserData);
- static void TubeAcceptedHandler(GObject* pSource, GAsyncResult* pResult, gpointer pUserData);
-
- static void methodCallHandler(GDBusConnection* pConnection,
- const gchar* pSender,
- const gchar* pObjectPath,
- const gchar* pInterfaceName,
- const gchar* pMethodName,
- GVariant* pParameters,
- GDBusMethodInvocation* pInvocation,
- void* pUserData);
-
private:
typedef ::std::queue<OString> TelePacketQueue;
bool spinUntilTubeEstablished();
- bool setTube( GDBusConnection* pTube);
TeleManager* mpManager;
TpAccount* mpAccount;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index c8e7b4ae356e..8e39e65d1289 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -147,6 +147,7 @@ public:
// Only for callbacks.
+ void addConference( TeleConference* pConference );
void setChannelReadyHandlerInvoked( bool b ) { mbChannelReadyHandlerInvoked = b; }
bool isChannelReadyHandlerInvoked() const { return mbChannelReadyHandlerInvoked; }
void setAccountManagerReadyHandlerInvoked( bool b );
@@ -192,19 +193,7 @@ public:
TpAccount* getAccount( const rtl::OString& rAccountID );
-/* Callbacks; not for use outside this class. */
- static void DBusChannelHandler(
- TpSimpleHandler* /*handler*/,
- TpAccount* pAccount,
- TpConnection* /*connection*/,
- GList* pChannels,
- GList* /*requests_satisfied*/,
- gint64 /*user_action_time*/,
- TpHandleChannelsContext* pContext,
- gpointer pUserData);
-
private:
- void addConference( TeleConference* );
void ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy );
bool mbChannelReadyHandlerInvoked : 1;