pidgin/pidgin

Merged in rw_grim/pidgin (pull request #107)

2016-08-26, Gary Kramlich
865ab9664766
Parents c80bc6ef5d20acc7f34948c0
Children 5230b8073a373ac0882cd563
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
2 files changed, 7 insertions(+), 3 deletions(-)
  • +3 -1
    libpurple/media.c
  • +4 -2
    libpurple/mediamanager.c
    • --- a/libpurple/media.c Thu Aug 25 23:22:54 2016 -0500
    +++ b/libpurple/media.c Fri Aug 26 00:36:21 2016 -0500
    @@ -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 */
    --- a/libpurple/mediamanager.c Thu Aug 25 23:22:54 2016 -0500
    +++ b/libpurple/mediamanager.c Fri Aug 26 00:36:21 2016 -0500
    @@ -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