|
 |
c51fd9 |
From 9f0d8a6e7444dd59729bac2c24717ea72aea5080 Mon Sep 17 00:00:00 2001
|
|
|
c51fd9 |
From: Michael Catanzaro <mcatanzaro@gnome.org>
|
|
|
c51fd9 |
Date: Thu, 21 Jul 2016 20:48:12 -0500
|
|
|
c51fd9 |
Subject: [PATCH] Revert "Don't call XInitThreads in Wayland"
|
|
|
c51fd9 |
|
|
|
c51fd9 |
This reverts commit a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e.
|
|
|
c51fd9 |
|
|
|
c51fd9 |
It causes empathy-call to crash when run in X11, and fixes absolutely
|
|
|
c51fd9 |
nothing. See the bug for details.
|
|
|
c51fd9 |
|
|
|
c51fd9 |
Thanks to Diane Trout for investigating and preparing a substantially-
|
|
|
c51fd9 |
identical patch.
|
|
|
c51fd9 |
|
|
|
c51fd9 |
https://bugzilla.gnome.org/show_bug.cgi?id=767516
|
|
|
c51fd9 |
---
|
|
|
c51fd9 |
src/empathy-call.c | 9 +++------
|
|
|
c51fd9 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
c51fd9 |
|
|
|
c51fd9 |
diff --git a/src/empathy-call.c b/src/empathy-call.c
|
|
|
c51fd9 |
index 8821bf3..1ac8a79 100644
|
|
|
c51fd9 |
--- a/src/empathy-call.c
|
|
|
c51fd9 |
+++ b/src/empathy-call.c
|
|
|
c51fd9 |
@@ -28,7 +28,6 @@
|
|
|
c51fd9 |
#include <tp-account-widgets/tpaw-utils.h>
|
|
|
c51fd9 |
|
|
|
c51fd9 |
#ifdef CLUTTER_WINDOWING_X11
|
|
|
c51fd9 |
-#include <gdk/gdkx.h>
|
|
|
c51fd9 |
#include <X11/Xlib.h>
|
|
|
c51fd9 |
#endif
|
|
|
c51fd9 |
|
|
|
c51fd9 |
@@ -216,11 +215,9 @@ main (int argc,
|
|
|
c51fd9 |
g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE);
|
|
|
c51fd9 |
|
|
|
c51fd9 |
#ifdef GDK_WINDOWING_X11
|
|
|
c51fd9 |
- if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
|
|
|
c51fd9 |
- /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice
|
|
|
c51fd9 |
- * but to intiialise X11 threading ourself */
|
|
|
c51fd9 |
- XInitThreads ();
|
|
|
c51fd9 |
- }
|
|
|
c51fd9 |
+ /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice
|
|
|
c51fd9 |
+ * but to intiialise X11 threading ourself */
|
|
|
c51fd9 |
+ XInitThreads ();
|
|
|
c51fd9 |
#endif
|
|
|
c51fd9 |
|
|
|
c51fd9 |
optcontext = g_option_context_new (N_("- Empathy Audio/Video Client"));
|