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.
This commit is contained in:
parent
3d350078a8
commit
8d40cb9470
@ -1725,8 +1725,10 @@ clutter_init_with_args (int *argc,
|
|||||||
|
|
||||||
if (!ctx->defer_display_setup)
|
if (!ctx->defer_display_setup)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
if (argc && *argc > 0 && *argv)
|
if (argc && *argc > 0 && *argv)
|
||||||
g_set_prgname ((*argv)[0]);
|
g_set_prgname ((*argv)[0]);
|
||||||
|
#endif
|
||||||
|
|
||||||
context = g_option_context_new (parameter_string);
|
context = g_option_context_new (parameter_string);
|
||||||
|
|
||||||
@ -1831,8 +1833,10 @@ clutter_init (int *argc,
|
|||||||
|
|
||||||
if (!ctx->defer_display_setup)
|
if (!ctx->defer_display_setup)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
if (argc && *argc > 0 && *argv)
|
if (argc && *argc > 0 && *argv)
|
||||||
g_set_prgname ((*argv)[0]);
|
g_set_prgname ((*argv)[0]);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* parse_args will trigger backend creation and things like
|
/* parse_args will trigger backend creation and things like
|
||||||
* DISPLAY connection etc.
|
* DISPLAY connection etc.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user