/pidgin/main: 9096db705fda: Fix merge conflicts in mediamanager.c

Changeset: 9096db705fdaead474b3e6404486b9dd1c8c43b1
Author:	 Jakub Adam <[email protected]>
Date:	 2016-08-20 20:00 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/9096db705fda

Description:

Fix merge conflicts in mediamanager.c

diffstat:

 libpurple/mediamanager.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (19 lines):

diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -36,6 +36,7 @@
 #ifdef HAVE_MEDIA_APPLICATION
 #include <gst/app/app.h>
 #endif
+#endif /* USE_VV */
 
 /** @copydoc _PurpleMediaOutputWindow */
 typedef struct _PurpleMediaOutputWindow PurpleMediaOutputWindow;
@@ -129,7 +130,6 @@ enum {
 	LAST_SIGNAL
 };
 static guint purple_media_manager_signals[LAST_SIGNAL] = {0};
-#endif
 
 GType
 purple_media_manager_get_type()

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