# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1239429650 0
# Node ID 4f2f5659aa0df5fedd820a6a19470669351b5c64
# Parent  d7bd1431b989750864a8d103a3c203f675dcdb85
Fix build with --disable-gstreamer.

diff -r d7bd1431b989 -r 4f2f5659aa0d finch/gntmedia.c
--- a/finch/gntmedia.c	Sat Apr 11 02:55:46 2009 +0000
+++ b/finch/gntmedia.c	Sat Apr 11 06:00:50 2009 +0000
@@ -37,11 +37,11 @@
 #include "cmds.h"
 #include "conversation.h"
 #include "debug.h"
-#include "media-gst.h"
 #include "mediamanager.h"
 
 /* An incredibly large part of the following is from gtkmedia.c */
 #ifdef USE_VV
+#include "media-gst.h"
 
 #undef hangup
 
diff -r d7bd1431b989 -r 4f2f5659aa0d libpurple/media.c
--- a/libpurple/media.c	Sat Apr 11 02:55:46 2009 +0000
+++ b/libpurple/media.c	Sat Apr 11 06:00:50 2009 +0000
@@ -31,7 +31,6 @@
 #include "account.h"
 #include "marshallers.h"
 #include "media.h"
-#include "media-gst.h"
 #include "mediamanager.h"
 #include "network.h"
 
@@ -39,6 +38,7 @@
 
 #ifdef USE_VV
 
+#include "media-gst.h"
 #include <gst/farsight/fs-conference-iface.h>
 
 /** @copydoc _PurpleMediaSession */
@@ -1908,6 +1908,7 @@
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_get_src(PurpleMedia *media, const gchar *sess_id)
 {
@@ -1920,6 +1921,7 @@
 	return NULL;
 #endif
 }
+#endif /* USE_GSTREAMER */
 
 #ifdef USE_VV
 static PurpleMediaSession *
@@ -3034,6 +3036,7 @@
 #endif
 }
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_get_tee(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
@@ -3056,4 +3059,5 @@
 	return NULL;
 #endif
 }
-
+#endif /* USE_GSTREAMER */
+
diff -r d7bd1431b989 -r 4f2f5659aa0d libpurple/mediamanager.c
--- a/libpurple/mediamanager.c	Sat Apr 11 02:55:46 2009 +0000
+++ b/libpurple/mediamanager.c	Sat Apr 11 06:00:50 2009 +0000
@@ -30,8 +30,11 @@
 #include "debug.h"
 #include "marshallers.h"
 #include "media.h"
+#include "mediamanager.h"
+
+#ifdef USE_GSTREAMER
 #include "media-gst.h"
-#include "mediamanager.h"
+#endif
 
 #ifdef USE_VV
 
@@ -218,6 +221,7 @@
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_manager_get_pipeline(PurpleMediaManager *manager)
 {
@@ -246,6 +250,7 @@
 	return NULL;
 #endif
 }
+#endif /* USE_GSTREAMER */
 
 PurpleMedia *
 purple_media_manager_create_media(PurpleMediaManager *manager,
@@ -366,6 +371,7 @@
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_manager_get_element(PurpleMediaManager *manager,
 		PurpleMediaSessionType type, PurpleMedia *media,
@@ -611,6 +617,7 @@
 
 	return NULL;
 }
+#endif /* USE_GSTREAMER */
 
 #ifdef USE_VV
 static void
@@ -844,6 +851,7 @@
 #endif
 }
 
+#ifdef USE_GSTREAMER
 
 /*
  * PurpleMediaElementType
@@ -1115,3 +1123,5 @@
 	return NULL;
 }
 
+#endif /* USE_GSTREAMER */
+