Stop using Farsight2 headers

https://bugzilla.gnome.org/show_bug.cgi?id=670638

diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 3586f15847d4554331b07d1d6ea4c849bbe43d0c..d0f15eecc4cf61d36a4461ca35eff6b67cedb934 100644 (file)
--- 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 51732e0243ffa85983513f348941dc418d087c8c..711447d6eb4a609c6d9bec44e74231a45d361eb0 100644 (file)
--- 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 0eee9e0bc169405db989ea78b5cc3d08cb6666a2..687fab3c55acb8d350a033620a112a71546ac65e 100644 (file)
--- 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"