tubes: do not include telepathy-glib.h in public headers

Change-Id: Ib2c88f2f1fc1c9ebffbbdc9896045c3d1e5b719c

sc/source/ui/collab/contacts.cxx

@@ -39,6 +39,8 @@
 #include <vcl/dialog.hxx>
 #include <svx/simptabl.hxx>
 
+#include <telepathy-glib/telepathy-glib.h>
+
 #define CONTACTS_DLG
 
 #ifdef CONTACTS_DLG

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

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;
 

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.
 

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

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;