diff options
author | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-01-16 06:59:50 -0600 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-01-16 07:00:55 -0600 |
commit | a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e (patch) | |
tree | 8ed8121f2e43bd0f5803bcefca641feeb870c77a | |
parent | c93fa8cdd89e95486129bdaea693b7e98694e70a (diff) | |
download | empathy-a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e.tar.gz |
Don't call XInitThreads in Wayland
This doesn't fix anything in particular, but seems like a good idea....
-rw-r--r-- | src/empathy-call.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/empathy-call.c b/src/empathy-call.c index 991904108..3bc148802 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -28,6 +28,7 @@ #include <tp-account-widgets/tpaw-utils.h> #ifdef CLUTTER_WINDOWING_X11 +#include <gdk/gdkx.h> #include <X11/Xlib.h> #endif @@ -215,9 +216,11 @@ main (int argc, g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE); #ifdef GDK_WINDOWING_X11 - /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice - * but to intiialise X11 threading ourself */ - XInitThreads (); + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { + /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice + * but to intiialise X11 threading ourself */ + XInitThreads (); + } #endif optcontext = g_option_context_new (N_("- Empathy Audio/Video Client")); |