brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Don't call g_type_init from meta_init

Browse Source 
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:
Jasper St. Pierre 2012-04-05 00:43:39 -04:00
parent f143fe3710
commit 33e1017403
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View File

@ -381,8 +381,6 @@ meta_init (void)
struct sigaction act; struct sigaction act;
sigset_t empty_mask; sigset_t empty_mask;
GIOChannel *channel; GIOChannel *channel;
g_type_init ();
sigemptyset (&empty_mask); sigemptyset (&empty_mask);
act.sa_handler = SIG_IGN; act.sa_handler = SIG_IGN;

2
src/core/mutter.c
View File

@ -69,6 +69,8 @@ main (int argc, char **argv)
GOptionContext *ctx; GOptionContext *ctx;
GError *error = NULL; GError *error = NULL;
g_type_init ();
ctx = meta_get_option_context (); ctx = meta_get_option_context ();
g_option_context_add_main_entries (ctx, mutter_options, GETTEXT_PACKAGE); g_option_context_add_main_entries (ctx, mutter_options, GETTEXT_PACKAGE);
if (!g_option_context_parse (ctx, &argc, &argv, &error)) if (!g_option_context_parse (ctx, &argc, &argv, &error))