/pidgin/main: 98705553ab45: Merged in xhaakon/pidgin (pull reque...

[Gary Kramlich]

Changeset: 98705553ab45be810851be64cea461310e4a659e
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-03-24 22:52 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/98705553ab45

Description:

Merged in xhaakon/pidgin (pull request #29)

7ae670e19fb4

diffstat:

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

diffs (36 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
 };
 
@@ -3688,15 +3686,17 @@ create_video_pipeline(void)
 {
 	GstElement *pipeline;
 	GstElement *src, *sink;
+	GstElement *videoconvert;
 
 	pipeline = gst_pipeline_new("videotest");
 	src = create_test_element(PURPLE_MEDIA_ELEMENT_VIDEO | PURPLE_MEDIA_ELEMENT_SRC);
 	sink = create_test_element(PURPLE_MEDIA_ELEMENT_VIDEO | PURPLE_MEDIA_ELEMENT_SINK);
+	videoconvert = gst_element_factory_make("videoconvert", NULL);
 
 	g_object_set_data(G_OBJECT(pipeline), "sink", sink);
 
-	gst_bin_add_many(GST_BIN(pipeline), src, sink, NULL);
-	gst_element_link_many(src, sink, NULL);
+	gst_bin_add_many(GST_BIN(pipeline), src, videoconvert, sink, NULL);
+	gst_element_link_many(src, videoconvert, sink, NULL);
 
 	return pipeline;
 }