From 2f7d7b2d43b15f9133e2c89ead564651b03e6bd5 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 9 Aug 2010 10:05:35 +0200 Subject: use gtk_clutter_init rather than clutter_init This should fix the "Unable to make the stage window ..... the current GLX drawable" warning. Thanks to Jiri Techet to have spotted this. --- src/empathy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/empathy.c b/src/empathy.c index fd49d34e8..82be5ce22 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -488,13 +488,15 @@ main (int argc, char *argv[]) /* Init */ g_thread_init (NULL); + +#ifdef HAVE_LIBCHAMPLAIN + gtk_clutter_init (&argc, &argv); +#endif + empathy_init (); optcontext = g_option_context_new (N_("- Empathy IM Client")); g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); -#ifdef HAVE_LIBCHAMPLAIN - g_option_context_add_group (optcontext, clutter_get_option_group ()); -#endif g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); if (!g_option_context_parse (optcontext, &argc, &argv, &error)) { -- cgit v1.2.3