diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-09 23:02:44 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-09 23:02:44 +0800 |
| commit | 2cdb20a345bc961dcd3dc3fca4e7731486c22aeb (patch) | |
| tree | 0030c7ef232a53c016b41931d0993ee6c5303514 /src | |
| parent | 31debb1f437fc32ebeb389cae1eab92388be6bea (diff) | |
| download | gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar.gz gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar.bz2 gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar.lz gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar.xz gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.tar.zst gsoc2013-empathy-2cdb20a345bc961dcd3dc3fca4e7731486c22aeb.zip | |
empathy-call: call XInitThreads()
Diffstat (limited to 'src')
| -rw-r--r-- | 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 2ff49a81b..71d9db707 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 (); |