From 2cdb20a345bc961dcd3dc3fca4e7731486c22aeb Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 9 Feb 2012 16:02:44 +0100
Subject: [PATCH] empathy-call: call XInitThreads()

---
 src/empathy-call.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 2ff49a81..71d9db70 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -30,6 +30,10 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
+#ifdef CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
+
 #include <telepathy-glib/debug-sender.h>
 
 #include <telepathy-yell/telepathy-yell.h>
@@ -187,6 +191,12 @@ main (int argc,
   /* Init */
   g_thread_init (NULL);
 
+#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 ();
+#endif
+
   /* Clutter needs this */
   gdk_disable_multidevice ();
 
-- 
2.39.2