[clutter-gst] playback: Fix X11 code running on non-X11 backends
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter-gst] playback: Fix X11 code running on non-X11 backends
- Date: Tue, 26 Mar 2013 11:09:07 +0000 (UTC)
commit b23c0c06bd1e2aff3ba1dbc92327529c08585c3d
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 26 11:42:11 2013 +0100
playback: Fix X11 code running on non-X11 backends
Check that we're running in X11 before calling
clutter_x11_get_default_display() and using its result.
https://bugzilla.gnome.org/show_bug.cgi?id=681508
clutter-gst/clutter-gst-playback.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-playback.c b/clutter-gst/clutter-gst-playback.c
index 1b00615..a368de1 100644
--- a/clutter-gst/clutter-gst-playback.c
+++ b/clutter-gst/clutter-gst-playback.c
@@ -2029,8 +2029,9 @@ clutter_gst_playback_init (ClutterGstPlayback *self)
self);
#if defined(CLUTTER_WINDOWING_X11) && defined (HAVE_HW_DECODER_SUPPORT)
- gst_bus_set_sync_handler (priv->bus, on_sync_message,
- clutter_x11_get_default_display (), NULL);
+ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+ gst_bus_set_sync_handler (priv->bus, on_sync_message,
+ clutter_x11_get_default_display (), NULL);
#endif
gst_object_unref (GST_OBJECT (priv->bus));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]