Only include telepathy-glib.h

Also bump telepathy-glib requirement to 0.19.0

https://bugs.freedesktop.org/show_bug.cgi?id=54999

13 files changed, 16 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 6d0b8fa..0fdc4bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
 dnl Check for Telepathy libraries
-PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.17.5])
+PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.19.0])
 
 AC_SUBST(TELEPATHY_CFLAGS)
 AC_SUBST(TELEPATHY_LIBS)
diff --git a/telepathy-farstream/call-channel.c b/telepathy-farstream/call-channel.c
index 5ad4158..3b7cf58 100644
--- a/telepathy-farstream/call-channel.c
+++ b/telepathy-farstream/call-channel.c
@@ -30,8 +30,7 @@
 
 #include "call-channel.h"
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <farstream/fs-conference.h>
 
 #include "call-content.h"
diff --git a/telepathy-farstream/call-channel.h b/telepathy-farstream/call-channel.h
index 8c268d2..525e12f 100644
--- a/telepathy-farstream/call-channel.h
+++ b/telepathy-farstream/call-channel.h
@@ -24,7 +24,7 @@
 
 #include <gst/gst.h>
 #include <farstream/fs-conference.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 4d17f4f..d95a19f 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -747,7 +747,7 @@ tf_call_stream_add_remote_candidates (TfCallStream *self,
       cand->username = g_strdup (username);
       cand->password = g_strdup (password);
       cand->ttl = ttl;
-      cand->base_ip = base_ip;
+      cand->base_ip = g_strdup (base_ip);
       cand->base_port = base_port;
 
       fscandidates = g_list_append (fscandidates, cand);
diff --git a/telepathy-farstream/channel.h b/telepathy-farstream/channel.h
index e66742c..77b3038 100644
--- a/telepathy-farstream/channel.h
+++ b/telepathy-farstream/channel.h
@@ -2,9 +2,8 @@
 #define __TF_CHANNEL_H__
 
 #include <glib-object.h>
-
-#include <telepathy-glib/channel.h>
 #include <gst/gst.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-farstream/media-signalling-channel.c b/telepathy-farstream/media-signalling-channel.c
index e9b9e0e..52db185 100644
--- a/telepathy-farstream/media-signalling-channel.c
+++ b/telepathy-farstream/media-signalling-channel.c
@@ -31,8 +31,7 @@
 
 #include "media-signalling-channel.h"
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "stream.h"
 #include "session-priv.h"
diff --git a/telepathy-farstream/media-signalling-channel.h b/telepathy-farstream/media-signalling-channel.h
index 57871df..7759b5a 100644
--- a/telepathy-farstream/media-signalling-channel.h
+++ b/telepathy-farstream/media-signalling-channel.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include "stream.h"
 #include "session-priv.h"
 
diff --git a/telepathy-farstream/media-signalling-content.c b/telepathy-farstream/media-signalling-content.c
index 1c3e77d..6e97b99 100644
--- a/telepathy-farstream/media-signalling-content.c
+++ b/telepathy-farstream/media-signalling-content.c
@@ -33,8 +33,8 @@
 #include <farstream/fs-conference.h>
 #include <farstream/fs-utils.h>
 
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/util.h>
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/telepathy-farstream/media-signalling-content.h b/telepathy-farstream/media-signalling-content.h
index 085ed9d..a918cde 100644
--- a/telepathy-farstream/media-signalling-content.h
+++ b/telepathy-farstream/media-signalling-content.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 
 #include <gst/gst.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "media-signalling-channel.h"
 #include "content.h"
diff --git a/telepathy-farstream/session-priv.h b/telepathy-farstream/session-priv.h
index af69c4d..3cfa289 100644
--- a/telepathy-farstream/session-priv.h
+++ b/telepathy-farstream/session-priv.h
@@ -2,7 +2,8 @@
 #define __TF_SESSION_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/media-interfaces.h>
+#include <gst/gst.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-farstream/session.c b/telepathy-farstream/session.c
index 6b4f74e..28a75b1 100644
--- a/telepathy-farstream/session.c
+++ b/telepathy-farstream/session.c
@@ -18,13 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/interfaces.h>
+#include "config.h"
+
+#include "session-priv.h"
 
 #include <farstream/fs-conference.h>
 
-#include "session-priv.h"
 
 G_DEFINE_TYPE (TfSession, _tf_session, G_TYPE_OBJECT);
 
diff --git a/telepathy-farstream/stream.c b/telepathy-farstream/stream.c
index 7dd1e0c..7959c12 100644
--- a/telepathy-farstream/stream.c
+++ b/telepathy-farstream/stream.c
@@ -35,11 +35,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-conference.h>
 #include <farstream/fs-rtp.h>
diff --git a/telepathy-farstream/stream.h b/telepathy-farstream/stream.h
index 40a8048..9cf639c 100644
--- a/telepathy-farstream/stream.h
+++ b/telepathy-farstream/stream.h
@@ -2,8 +2,7 @@
 #define __TF_STREAM_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/media-interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-conference.h>