aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-09 16:05:35 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-09 16:05:38 +0800
commit2f7d7b2d43b15f9133e2c89ead564651b03e6bd5 (patch)
tree332ace515a5097d04693cd9f83eeec3172427b44
parent8f76c30b382669eb3bd2d630b686100886e0114e (diff)
downloadgsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar.gz
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar.bz2
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar.lz
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar.xz
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.tar.zst
gsoc2013-empathy-2f7d7b2d43b15f9133e2c89ead564651b03e6bd5.zip
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.
-rw-r--r--src/empathy.c8
1 files changed, 5 insertions, 3 deletions
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)) {