empathy-call: call XInitThreads()
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 9 Feb 2012 15:02:44 +0000 (16:02 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 9 Feb 2012 15:02:44 +0000 (16:02 +0100)
src/empathy-call.c

index 2ff49a81b7dbd541c1263146227ec053617694f1..71d9db707ec3869ba00b0d827556baa8a4739d94 100644 (file)
 #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 ();