summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Ruprecht <cmaiku@gmail.com>2016-01-22 03:48:08 -0600
committerMike Ruprecht <cmaiku@gmail.com>2016-01-22 03:48:08 -0600
commitb4dbc877d027a32857400dae7b3fd49c47c288df (patch)
tree8c4937350e36a58a02ecb4e5f61841f47af1a532
parent832c334d5dc0cbb32c9367dca01185e6117c4698 (diff)
downloadpidgin-b4dbc877d027a32857400dae7b3fd49c47c288df.tar.gz
Remove ximagesink and xvimagesink from Pidgin options as they're broken
At the time of this commit, ximagesink and xvimagesink are broken when embedding into a Gtk window. They display as a black screen or artifacts of not being drawn. This commit doesn't disallow them completely as the default option still uses autovideosink, which can choose either of these sinks still. However, it's probably a good idea to remove known broken sinks to from the plugin options list.
-rw-r--r--pidgin/gtkprefs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index 878061d252..01f6f3d659 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -175,8 +175,10 @@ static const gchar *VIDEO_SINK_PLUGINS[] = {
"directdrawsink", "DirectDraw",
/* "gconfvideosink", "GConf", */
"glimagesink", "OpenGL",
- "ximagesink", "X Window System",
- "xvimagesink", "X Window System (Xv)",
+ /* Currently broken when embedding in a Gtk window
+ * "ximagesink", "X Window System",
+ * "xvimagesink", "X Window System (Xv)",
+ */
NULL
};