[empathy] use gtk_clutter_init rather than clutter_init

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2f7d7b2d43b15f9133e2c89ead564651b03e6bd5
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Aug 9 10:05:35 2010 +0200

    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 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index fd49d34..82be5ce 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)) {