Mercurial > pidgin
diff libpurple/mediamanager.c @ 32769:d9d55a03ec7b
propagate from branch 'im.pidgin.pidgin.2.x.y' (head c67a060046437347c5cc4f58bdff008d7b8c4496)
to branch 'im.pidgin.pidgin' (head 40617c1e9cdf903724dbeee455fccc8d64ace22f)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 06 Apr 2012 04:30:06 +0000 |
parents | fd1b4bbefc6b |
children |
line wrap: on
line diff
--- a/libpurple/mediamanager.c Fri Apr 06 04:30:00 2012 +0000 +++ b/libpurple/mediamanager.c Fri Apr 06 04:30:06 2012 +0000 @@ -39,7 +39,11 @@ #ifdef USE_VV #include <media/backend-fs2.h> +#ifdef HAVE_FARSIGHT #include <gst/farsight/fs-element-added-notifier.h> +#else +#include <farstream/fs-element-added-notifier.h> +#endif #include <gst/interfaces/xoverlay.h> /** @copydoc _PurpleMediaManagerPrivate */