diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-07-21 20:48:12 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-07-21 21:15:20 -0500 |
| commit | 9f0d8a6e7444dd59729bac2c24717ea72aea5080 (patch) | |
| tree | f4eb2f26376f2df033951a151d37b081c4df7ddf | |
| parent | fd624644340af9e14435f66d09979a6ed0f4c7a8 (diff) | |
| download | empathy-9f0d8a6e7444dd59729bac2c24717ea72aea5080.tar.gz | |
Revert "Don't call XInitThreads in Wayland"
This reverts commit a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e.
It causes empathy-call to crash when run in X11, and fixes absolutely
nothing. See the bug for details.
Thanks to Diane Trout for investigating and preparing a substantially-
identical patch.
https://bugzilla.gnome.org/show_bug.cgi?id=767516
| -rw-r--r-- | src/empathy-call.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/empathy-call.c b/src/empathy-call.c index 8821bf386..1ac8a79b0 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -28,7 +28,6 @@ #include <tp-account-widgets/tpaw-utils.h> #ifdef CLUTTER_WINDOWING_X11 -#include <gdk/gdkx.h> #include <X11/Xlib.h> #endif @@ -216,11 +215,9 @@ main (int argc, g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE); #ifdef GDK_WINDOWING_X11 - 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 (); - } + /* 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")); |