[empathy] empathy-call: call XInitThreads()



commit 2cdb20a345bc961dcd3dc3fca4e7731486c22aeb
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Feb 9 16:02:44 2012 +0100

    empathy-call: call XInitThreads()

 src/empathy-call.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 2ff49a8..71d9db7 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 ();
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]