diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-30 18:50:27 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:07 +0200 |
| commit | d32927c8be569062b72f01ae7b938e5ad9f1078b (patch) | |
| tree | e4d733864ae1f49aa01dd87915ecf4a2a746f0cb /tubes/inc | |
| parent | 86268ec22035855de9a505706c35217ba5a11565 (diff) | |
tubes: use GDBus rather than libdbus
GDBus is the future. And TpDBusTubeChannel will ultimately give us a
GDBusConnection, so...
Diffstat (limited to 'tubes/inc')
| -rw-r--r-- | tubes/inc/tubes/conference.hxx | 12 | ||||
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 4ae49c84530f..118def66621d 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -100,6 +100,15 @@ public: gpointer pUserData, GObject*pWeakObject); static void FTReady( EmpathyFTHandler *handler, GError *error, gpointer user_data); + static void methodCallHandler(GDBusConnection* pConnection, + const gchar* pSender, + const gchar* pObjectPath, + const gchar* pInterfaceName, + const gchar* pMethodName, + GVariant* pParameters, + GDBusMethodInvocation* pInvocation, + void* pUserData); + private: bool tryToOpen(); bool spinUntilTubeEstablished(); @@ -110,7 +119,8 @@ private: TpAccount* mpAccount; TpChannel* mpChannel; gchar* mpAddress; - DBusConnection* mpTube; + GDBusConnection* mpTube; + guint maObjectRegistrationId; TelePacketQueue maPacketQueue; TpTubeChannelState meTubeChannelState; diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 75e298c1c60e..9aef84706354 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -43,7 +43,9 @@ #include <boost/signals2.hpp> // For testing purposes, we might need more in future. +#define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc" #define LIBO_TUBES_DBUS_MSG_METHOD "LibOMsg" +#define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc" typedef ::std::vector<TeleConferencePtr> TeleConferenceVector; |