[empathy/gnome-2-34] Move farsight-using sources to src

[Emilio Pozuelo Monfort <epm src gnome org>]

commit fe148502a5dd08fc62825cac6272cb5e980984a6
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Mon Feb 21 10:59:56 2011 +0000

    Move farsight-using sources to src
    
    And only build them for empathy-av, since they use farsight.

 libempathy-gtk/Makefile.am                     |   12 ++----------
 src/Makefile.am                                |    9 ++++++++-
 {libempathy-gtk => src}/empathy-audio-sink.c   |    0
 {libempathy-gtk => src}/empathy-audio-sink.h   |    0
 {libempathy-gtk => src}/empathy-audio-src.c    |    0
 {libempathy-gtk => src}/empathy-audio-src.h    |    0
 src/empathy-streamed-media-window.c            |    8 ++++----
 {libempathy-gtk => src}/empathy-video-src.c    |    0
 {libempathy-gtk => src}/empathy-video-src.h    |    0
 {libempathy-gtk => src}/empathy-video-widget.c |    0
 {libempathy-gtk => src}/empathy-video-widget.h |    0
 11 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index ca14833..9e2671c 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -35,8 +35,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-account-widget-private.h	\
 	empathy-account-widget-sip.c		\
 	empathy-account-widget.c		\
-	empathy-audio-sink.c			\
-	empathy-audio-src.c			\
 	empathy-avatar-chooser.c		\
 	empathy-avatar-image.c			\
 	empathy-cell-renderer-activatable.c	\
@@ -90,17 +88,13 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-theme-irc.c			\
 	empathy-theme-manager.c			\
 	empathy-tls-dialog.c			\
-	empathy-ui-utils.c			\
-	empathy-video-src.c			\
-	empathy-video-widget.c
+	empathy-ui-utils.c
 
 libempathy_gtk_headers =			\
 	empathy-account-chooser.h		\
 	empathy-account-widget-irc.h		\
 	empathy-account-widget-sip.h		\
 	empathy-account-widget.h		\
-	empathy-audio-sink.h			\
-	empathy-audio-src.h			\
 	empathy-avatar-chooser.h		\
 	empathy-avatar-image.h			\
 	empathy-cell-renderer-activatable.h	\
@@ -155,9 +149,7 @@ libempathy_gtk_headers =			\
 	empathy-theme-irc.h			\
 	empathy-theme-manager.h			\
 	empathy-tls-dialog.h			\
-	empathy-ui-utils.h			\
-	empathy-video-src.h			\
-	empathy-video-widget.h
+	empathy-ui-utils.h
 
 libempathy_gtk_la_SOURCES =			\
 	$(libempathy_gtk_handwritten_source)	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b0d4e0..ffa7083 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,6 +111,10 @@ empathy_debugger_SOURCES =						\
 
 empathy_av_SOURCES = \
 	empathy-av.c \
+	empathy-audio-sink.c \
+	empathy-audio-sink.h \
+	empathy-audio-src.c \
+	empathy-audio-src.h \
 	empathy-streamed-media-factory.c \
 	empathy-streamed-media-factory.h \
 	empathy-streamed-media-handler.c \
@@ -121,7 +125,10 @@ empathy_av_SOURCES = \
 	empathy-streamed-media-window.h \
 	empathy-sidebar.c \
 	empathy-sidebar.h \
-	$(NULL)
+	empathy-video-src.c \
+	empathy-video-src.h \
+	empathy-video-widget.c \
+	empathy-video-widget.h
 
 nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
 
diff --git a/libempathy-gtk/empathy-audio-sink.c b/src/empathy-audio-sink.c
similarity index 100%
rename from libempathy-gtk/empathy-audio-sink.c
rename to src/empathy-audio-sink.c
diff --git a/libempathy-gtk/empathy-audio-sink.h b/src/empathy-audio-sink.h
similarity index 100%
rename from libempathy-gtk/empathy-audio-sink.h
rename to src/empathy-audio-sink.h
diff --git a/libempathy-gtk/empathy-audio-src.c b/src/empathy-audio-src.c
similarity index 100%
rename from libempathy-gtk/empathy-audio-src.c
rename to src/empathy-audio-src.c
diff --git a/libempathy-gtk/empathy-audio-src.h b/src/empathy-audio-src.h
similarity index 100%
rename from libempathy-gtk/empathy-audio-src.h
rename to src/empathy-audio-src.h
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 189537f..9635c6d 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -38,10 +38,6 @@
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-avatar-image.h>
-#include <libempathy-gtk/empathy-video-widget.h>
-#include <libempathy-gtk/empathy-audio-src.h>
-#include <libempathy-gtk/empathy-audio-sink.h>
-#include <libempathy-gtk/empathy-video-src.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-sound.h>
 #include <libempathy-gtk/empathy-geometry.h>
@@ -53,6 +49,10 @@
 #include "empathy-streamed-media-window.h"
 #include "empathy-streamed-media-window-fullscreen.h"
 #include "empathy-sidebar.h"
+#include "empathy-video-widget.h"
+#include "empathy-audio-src.h"
+#include "empathy-audio-sink.h"
+#include "empathy-video-src.h"
 
 #define BUTTON_ID "empathy-call-dtmf-button-id"
 
diff --git a/libempathy-gtk/empathy-video-src.c b/src/empathy-video-src.c
similarity index 100%
rename from libempathy-gtk/empathy-video-src.c
rename to src/empathy-video-src.c
diff --git a/libempathy-gtk/empathy-video-src.h b/src/empathy-video-src.h
similarity index 100%
rename from libempathy-gtk/empathy-video-src.h
rename to src/empathy-video-src.h
diff --git a/libempathy-gtk/empathy-video-widget.c b/src/empathy-video-widget.c
similarity index 100%
rename from libempathy-gtk/empathy-video-widget.c
rename to src/empathy-video-widget.c
diff --git a/libempathy-gtk/empathy-video-widget.h b/src/empathy-video-widget.h
similarity index 100%
rename from libempathy-gtk/empathy-video-widget.h
rename to src/empathy-video-widget.h