diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-23 20:48:47 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-23 21:43:53 +0200 |
| commit | db9630667061789106a5864300ca73d83d04aa73 (patch) | |
| tree | 020b7f32664b536c1150e3b1f29ea40f5f929875 /tubes | |
| parent | abeb02c02d6d2cf5ac48d75b04563d3376d71677 (diff) | |
tubes: do not include telepathy-glib.h in public headers
Change-Id: Ib2c88f2f1fc1c9ebffbbdc9896045c3d1e5b719c
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/inc/tubes/conference.hxx | 5 | ||||
| -rw-r--r-- | tubes/inc/tubes/contact-list.hxx | 6 | ||||
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 5 | ||||
| -rw-r--r-- | tubes/source/conference.cxx | 1 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 2 |
5 files changed, 15 insertions, 4 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index a66d65b024db..fc495e5247d9 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -32,11 +32,14 @@ #include <sal/config.h> #include "tubes/tubesdllapi.h" #include <rtl/ustring.hxx> -#include <telepathy-glib/telepathy-glib.h> #include <tubes/warnings_guard_boost_signals2.hpp> class TeleManager; class TeleConferenceImpl; +typedef struct _TpAccount TpAccount; +typedef struct _TpContact TpContact; +typedef struct _TpDBusTubeChannel TpDBusTubeChannel; +typedef struct _GDBusConnection GDBusConnection; /** Conference setup by TeleManager */ class TeleConference diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx index a17b1103d96f..9c48ab7896ce 100644 --- a/tubes/inc/tubes/contact-list.hxx +++ b/tubes/inc/tubes/contact-list.hxx @@ -32,10 +32,12 @@ #include <utility> #include <vector> -#include <telepathy-glib/telepathy-glib.h> - #include "tubes/tubesdllapi.h" +typedef struct _TpAccount TpAccount; +typedef struct _TpContact TpContact; +typedef struct _TpAccountManager TpAccountManager; + typedef ::std::pair< TpAccount *, TpContact * > AccountContactPair; typedef ::std::vector< AccountContactPair > AccountContactPairV; diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 8e39e65d1289..a112b6118a94 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -37,7 +37,6 @@ #include <salhelper/thread.hxx> #include <rtl/ref.hxx> #include <tools/link.hxx> -#include <telepathy-glib/telepathy-glib.h> // For testing purposes, we might need more in future. #define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc" @@ -46,6 +45,10 @@ namespace osl { class Mutex; } class TeleManagerImpl; +typedef struct _TpAccount TpAccount; +typedef struct _TpContact TpContact; +typedef struct _GMainLoop GMainLoop; +typedef struct _GMainContext GMainContext; /** Interface to Telepathy DBus Tubes. diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index a2fafd23f7a1..d28ffc34aabf 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -31,6 +31,7 @@ #include <tubes/constants.h> #include <tubes/file-transfer-helper.h> +#include <telepathy-glib/telepathy-glib.h> #include <queue> #if defined SAL_LOG_INFO diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 4abed6b2f4bb..d16422dacb8c 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -39,6 +39,8 @@ #include <osl/mutex.hxx> #include <rtl/strbuf.hxx> #include <rtl/uuid.h> + +#include <telepathy-glib/telepathy-glib.h> #include <map> namespace css = ::com::sun::star; |