Commit 42ec45e3 authored by Cosimo Cecchi's avatar Cosimo Cecchi Committed by Cosimo Cecchi

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
parent b2dff511
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.
2008-09-13 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c: Do as the docs for
......
......@@ -699,6 +699,10 @@ do_post_parse_initialization (int *argc,
_gtk_modules_init (argc, argv, gtk_modules_string->str);
g_string_free (gtk_modules_string, TRUE);
}
else
{
_gtk_modules_init (argc, argv, NULL);
}
}
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment