aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Kulyk <gkulyk@yahoo.de>2012-02-23 16:38:16 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-02-23 16:38:16 +0800
commit354671e1521cc3157d44701cbac56b3eb19fb35c (patch)
tree584a5293b6bbbc0e8323d4c9611e2e3de79bf695
parent19ab99537ee4f6aaf53ac41fd5337f20ac7c9766 (diff)
downloadgsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar.gz
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar.bz2
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar.lz
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar.xz
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.tar.zst
gsoc2013-empathy-354671e1521cc3157d44701cbac56b3eb19fb35c.zip
Stop using Farsight2 headers
https://bugzilla.gnome.org/show_bug.cgi?id=670638
-rw-r--r--src/empathy-call-handler.h2
-rw-r--r--src/empathy-call-window.c4
-rw-r--r--src/empathy-video-widget.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 3586f1584..d0f15eecc 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <farstream/fs-conference.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 51732e024..711447d6e 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -38,8 +38,8 @@
#include <telepathy-farstream/telepathy-farstream.h>
#include <telepathy-glib/util.h>
-#include <gst/farsight/fs-element-added-notifier.h>
-#include <gst/farsight/fs-utils.h>
+#include <farstream/fs-element-added-notifier.h>
+#include <farstream/fs-utils.h>
#include <libempathy/empathy-camera-monitor.h>
#include <libempathy/empathy-gsettings.h>
diff --git a/src/empathy-video-widget.c b/src/empathy-video-widget.c
index 0eee9e0bc..687fab3c5 100644
--- a/src/empathy-video-widget.c
+++ b/src/empathy-video-widget.c
@@ -25,7 +25,7 @@
#include <gdk/gdkx.h>
#include <gst/interfaces/xoverlay.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
#include "empathy-video-widget.h"