/pidgin/main: eacd3d5842fc: Re-enable ximagesink and xvimagesink...

[Jakub Adam]

Changeset: eacd3d5842fcf7f787fe0cab31f1e248c63a6b8c
Author:	 Jakub Adam <jakub.adam at ktknet.cz>
Date:	 2016-03-21 13:07 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/eacd3d5842fc

Description:

Re-enable ximagesink and xvimagesink video outputs.

Commit 92bff33e5d0d fixed the GTK+ embedding issue.

diffstat:

 pidgin/gtkprefs.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (16 lines):

diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -175,10 +175,8 @@ static const gchar *VIDEO_SINK_PLUGINS[]
 	"directdrawsink", "DirectDraw",
 	/* "gconfvideosink", "GConf", */
 	"glimagesink",	"OpenGL",
-	/* Currently broken when embedding in a Gtk window
-	 * "ximagesink",	"X Window System",
-	 * "xvimagesink",	"X Window System (Xv)",
-	 */
+	"ximagesink",	"X Window System",
+	"xvimagesink",	"X Window System (Xv)",
 	NULL
 };