/pidgin/main: 865ab9664766: Merged in rw_grim/pidgin (pull reque...

Changeset: 865ab96647669f7bf26f9424bfa856ef0365f26a
Author:	 Gary Kramlich <[email protected]>
Date:	 2016-08-26 00:36 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/865ab9664766

Description:

Merged in rw_grim/pidgin (pull request #107)

This still need to be separated because compiling witih --disable-vv and --enable-gstreamer is impossible if they're not separated

diffstat:

 libpurple/media.c        |  4 +++-
 libpurple/mediamanager.c |  6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (37 lines):

diff --git a/libpurple/media.c b/libpurple/media.c
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -27,11 +27,13 @@
 
 #include "debug.h"
 
-#ifdef USE_VV
+#ifdef USE_GSTREAMER
 #include "media/backend-fs2.h"
 #include "marshallers.h"
 #include "media-gst.h"
+#endif /* USE_GSTREAMER */
 
+#ifdef USE_VV
 /** @copydoc _PurpleMediaSession */
 typedef struct _PurpleMediaSession PurpleMediaSession;
 /** @copydoc _PurpleMediaStream */
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -26,11 +26,13 @@
 #include "media.h"
 #include "mediamanager.h"
 
-#ifdef USE_VV
+#ifdef USE_GSTREAMER
 #include "marshallers.h"
 #include "media-gst.h"
 #include <media/backend-fs2.h>
-
+#endif /* USE_GSTREAMER */
+
+#ifdef USE_VV
 #include <farstream/fs-element-added-notifier.h>
 #include <gst/video/videooverlay.h>
 #ifdef HAVE_MEDIA_APPLICATION

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits