From 129fb769bbaff17cff505c9249d513828454a9d2 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 23 Dec 2009 10:36:58 +0000 Subject: [PATCH] Use clutter_get_option_group instead of gtk_clutter_init clutter_get_option_group will initialize clutter during arguments parsing. This avoid to call g_set_prgname twice as it's called once by g_option_context_parse and once when initializing clutter. --- src/empathy.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/empathy.c b/src/empathy.c index 484cc540..ffb22a8e 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -913,6 +913,9 @@ main (int argc, char *argv[]) optcontext = g_option_context_new (N_("- Empathy IM Client")); g_option_context_add_group (optcontext, gst_init_get_option_group ()); g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); +#if 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)) { @@ -928,10 +931,6 @@ main (int argc, char *argv[]) g_set_application_name (_(PACKAGE_NAME)); g_setenv ("PULSE_PROP_media.role", "phone", TRUE); -#if HAVE_LIBCHAMPLAIN - gtk_clutter_init (&argc, &argv); -#endif - gtk_window_set_default_icon_name ("empathy"); textdomain (GETTEXT_PACKAGE); -- 2.39.2