diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2008-09-13 19:01:13 +0000 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-09-13 19:01:13 +0000 |
| commit | 42ec45e3c2dc352b8e5d96ffdae9b81e779f80e5 (patch) | |
| tree | b070831713bf1e89acc5a90446b86a31a6606db0 /gtk/gtkmodules.c | |
| parent | b2dff511d3ebb227a479d39ee9948ebd16fc6dd3 (diff) | |
| download | gtk+-42ec45e3c2dc352b8e5d96ffdae9b81e779f80e5.tar.gz | |
Bug 552153 – GtkModules loading with XSettings doesn't work if the
2008-09-13 Cosimo Cecchi <cosimoc@gnome.org>
Bug 552153 – GtkModules loading with XSettings doesn't work if the
GTK_MODULES env var isn't set.
* gtk/gtkmain.c: (do_post_parse_initialization):
* gtk/gtkmodules.c: (_gtk_modules_init):
Call _gtk_modules_init () even if gtk_modules_string is NULL, so
that GtkModules specified with XSettings could be loaded.
svn path=/trunk/; revision=21380
Diffstat (limited to 'gtk/gtkmodules.c')
| -rw-r--r-- | gtk/gtkmodules.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 0cac9634f4..764013f97e 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -511,11 +511,13 @@ _gtk_modules_init (gint *argc, G_CALLBACK (display_opened_cb), NULL); - /* Modules specified in the GTK_MODULES environment variable - * or on the command line are always loaded, so we'll just leak - * the refcounts. - */ - g_slist_free (load_modules (gtk_modules_args)); + if (gtk_modules_args) { + /* Modules specified in the GTK_MODULES environment variable + * or on the command line are always loaded, so we'll just leak + * the refcounts. + */ + g_slist_free (load_modules (gtk_modules_args)); + } } static void |