From 33e101740305f7cad679a27b8e60557724214146 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 5 Apr 2012 00:43:39 -0400 Subject: [PATCH] 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 --- src/core/main.c | 2 -- src/core/mutter.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index 4460e9bc1..b6593c165 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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; diff --git a/src/core/mutter.c b/src/core/mutter.c index 117a5491b..4c140d98e 100644 --- a/src/core/mutter.c +++ b/src/core/mutter.c @@ -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))