main: Don't call g_type_init from meta_init
For the plugin system, GType has to have been initialized by now. https://bugzilla.gnome.org/show_bug.cgi?id=676855
This commit is contained in:
parent
f143fe3710
commit
33e1017403
@ -381,8 +381,6 @@ meta_init (void)
|
||||
struct sigaction act;
|
||||
sigset_t empty_mask;
|
||||
GIOChannel *channel;
|
||||
|
||||
g_type_init ();
|
||||
|
||||
sigemptyset (&empty_mask);
|
||||
act.sa_handler = SIG_IGN;
|
||||
|
@ -69,6 +69,8 @@ main (int argc, char **argv)
|
||||
GOptionContext *ctx;
|
||||
GError *error = NULL;
|
||||
|
||||
g_type_init ();
|
||||
|
||||
ctx = meta_get_option_context ();
|
||||
g_option_context_add_main_entries (ctx, mutter_options, GETTEXT_PACKAGE);
|
||||
if (!g_option_context_parse (ctx, &argc, &argv, &error))
|
||||
|
Loading…
x
Reference in New Issue
Block a user