pidgin: 27935bed: Fix build with --disable-gstreamer.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 27935bed3e3568d2eb5cd1cb46efdc8f3c22f32b
Ancestor: 079a5ca1aa110ee9f6661eba31e5ea3f0b5a07e7
Author: sadrul at pidgin.im
Date: 2009-04-11T06:00:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/27935bed3e3568d2eb5cd1cb46efdc8f3c22f32b

Modified files:
        finch/gntmedia.c libpurple/media.c libpurple/mediamanager.c

ChangeLog: 

Fix build with --disable-gstreamer.

-------------- next part --------------
============================================================
--- finch/gntmedia.c	c9d4673eb2af601587d2d4d01600d362b019e0b3
+++ finch/gntmedia.c	d9557056fc5ae1681332c5c21ed794e6309a24a8
@@ -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
 
============================================================
--- libpurple/media.c	714ccaeba61d0b1228b56efc5d10b912375e6db7
+++ libpurple/media.c	ded84902b3c8983756b1f5ceedf35ef34f42a5b0
@@ -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 @@ purple_media_set_src(PurpleMedia *media,
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_get_src(PurpleMedia *media, const gchar *sess_id)
 {
@@ -1920,6 +1921,7 @@ purple_media_get_src(PurpleMedia *media,
 	return NULL;
 #endif
 }
+#endif /* USE_GSTREAMER */
 
 #ifdef USE_VV
 static PurpleMediaSession *
@@ -3034,6 +3036,7 @@ purple_media_remove_output_windows(Purpl
 #endif
 }
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_get_tee(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
@@ -3056,4 +3059,5 @@ purple_media_get_tee(PurpleMedia *media,
 	return NULL;
 #endif
 }
+#endif /* USE_GSTREAMER */
 
============================================================
--- libpurple/mediamanager.c	9e0c1a7590f221cf86d66539f4a7f5b83f2d740b
+++ libpurple/mediamanager.c	c139c201fe1a005d2eb5a4c5affd0c4db6bd877d
@@ -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 @@ pipeline_bus_call(GstBus *bus, GstMessag
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_manager_get_pipeline(PurpleMediaManager *manager)
 {
@@ -246,6 +250,7 @@ purple_media_manager_get_pipeline(Purple
 	return NULL;
 #endif
 }
+#endif /* USE_GSTREAMER */
 
 PurpleMedia *
 purple_media_manager_create_media(PurpleMediaManager *manager,
@@ -366,6 +371,7 @@ request_pad_unlinked_cb(GstPad *pad, Gst
 }
 #endif
 
+#ifdef USE_GSTREAMER
 GstElement *
 purple_media_manager_get_element(PurpleMediaManager *manager,
 		PurpleMediaSessionType type, PurpleMedia *media,
@@ -611,6 +617,7 @@ purple_media_manager_get_active_element(
 
 	return NULL;
 }
+#endif /* USE_GSTREAMER */
 
 #ifdef USE_VV
 static void
@@ -844,6 +851,7 @@ purple_media_manager_get_ui_caps(PurpleM
 #endif
 }
 
+#ifdef USE_GSTREAMER
 
 /*
  * PurpleMediaElementType
@@ -1115,3 +1123,5 @@ purple_media_element_info_call_create(Pu
 	return NULL;
 }
 
+#endif /* USE_GSTREAMER */
+