[totem] backend: Another guard against X11 calls
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] backend: Another guard against X11 calls
- Date: Thu, 29 Mar 2012 14:08:38 +0000 (UTC)
commit 86c2dfa75c032fd21a3a6024aec00c6bf5a7b8ee
Author: Bastien Nocera <hadess hadess net>
Date: Thu Mar 29 16:03:29 2012 +0200
backend: Another guard against X11 calls
.../bacon-video-widget-gst-missing-plugins.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/backend/bacon-video-widget-gst-missing-plugins.c b/src/backend/bacon-video-widget-gst-missing-plugins.c
index f91c58f..6e0bd10 100644
--- a/src/backend/bacon-video-widget-gst-missing-plugins.c
+++ b/src/backend/bacon-video-widget-gst-missing-plugins.c
@@ -243,6 +243,9 @@ bacon_video_widget_gst_on_missing_plugins_event (BaconVideoWidget *bvw, char **d
TotemCodecInstallContext *ctx;
GstInstallPluginsReturn status;
guint i, num;
+#ifdef GDK_WINDOWING_X11
+ GdkDisplay *display;
+#endif
num = g_strv_length (details);
g_return_val_if_fail (num > 0 && g_strv_length (descriptions) == num, FALSE);
@@ -281,14 +284,18 @@ bacon_video_widget_gst_on_missing_plugins_event (BaconVideoWidget *bvw, char **d
install_ctx = gst_install_plugins_context_new ();
#ifdef GDK_WINDOWING_X11
- if (gtk_widget_get_window (GTK_WIDGET (bvw)) != NULL && gtk_widget_get_realized (GTK_WIDGET (bvw)))
+ display = gdk_display_get_default ();
+
+ if (GDK_IS_X11_DISPLAY (display) &&
+ gtk_widget_get_window (GTK_WIDGET (bvw)) != NULL &&
+ gtk_widget_get_realized (GTK_WIDGET (bvw)))
{
gulong xid = 0;
xid = bacon_video_widget_gst_get_toplevel (GTK_WIDGET (bvw));
gst_install_plugins_context_set_xid (install_ctx, xid);
}
-#endif
+#endif /* GDK_WINDOWING_X11 */
status = gst_install_plugins_async (ctx->details, install_ctx,
on_plugin_installation_done,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]