#include <clutter-gtk/clutter-gtk.h>
#include <clutter-gst/clutter-gst.h>
-#include <telepathy-glib/debug-sender.h>
+#ifdef CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
-#include <telepathy-yell/telepathy-yell.h>
+#include <telepathy-glib/debug-sender.h>
#include <libempathy/empathy-client-factory.h>
static gboolean
incoming_call_cb (EmpathyCallFactory *factory,
guint handle,
- TpyCallChannel *channel,
+ TpCallChannel *channel,
TpChannelDispatchOperation *dispatch_operation,
TpAddDispatchOperationContext *context,
gpointer user_data)
/* 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 ();
g_option_context_free (optcontext);
- tpy_cli_init ();
-
gtk_clutter_init (&argc, &argv);
clutter_gst_init (&argc, &argv);