AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 552153 – GtkModules loading with XSettings doesn't work if the

Browse Source 
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
This commit is contained in:
Cosimo Cecchi 2008-09-13 19:01:13 +00:00 committed by Cosimo Cecchi
parent b2dff511d3
commit 42ec45e3c2
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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

4
gtk/gtkmain.c
View File

@ -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);
}
}

12
gtk/gtkmodules.c
View File

@ -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