Merge remote-tracking branch 'origin/call1' into master+call

[empathy.git] / src / empathy-call.c

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 21b751df9cdaf3cbd09d3dda257dd97b482abfaa..5f45d1ee566b142b3f7df5faa03851179bbd9d0e 100644 (file)
--- 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 <libempathy/empathy-client-factory.h>
@@ -185,6 +189,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 ();