From 8d40cb947031f90a7b8cf459720278c6a6fe295d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 3 Jan 2010 20:12:49 +0000 Subject: [PATCH] Disable g_set_prgname() Apparently, calling g_set_prgname() multiple times is not allowed anymore, and hence clutter_init_* calls should not do that. Though this is really GLib's fault - and a massive nuisance for us - we should prolly comply to avoid the test suite dying on us. --- clutter/clutter-main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 4b749f27e..84f5ed696 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -1725,8 +1725,10 @@ clutter_init_with_args (int *argc, if (!ctx->defer_display_setup) { +#if 0 if (argc && *argc > 0 && *argv) g_set_prgname ((*argv)[0]); +#endif context = g_option_context_new (parameter_string); @@ -1831,8 +1833,10 @@ clutter_init (int *argc, if (!ctx->defer_display_setup) { +#if 0 if (argc && *argc > 0 && *argv) g_set_prgname ((*argv)[0]); +#endif /* parse_args will trigger backend creation and things like * DISPLAY connection etc.