AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-05 18:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Don't load binary modules from the home directory by default

Browse Source 
We should rely on the module path environment variables being
set correctly for the architecture rather than load from .gtk-3.0

https://bugzilla.gnome.org/show_bug.cgi?id=646631
This commit is contained in:
William Jon McCann 2012-04-27 10:52:13 -04:00 committed by Matthias Clasen
parent bf71b88319
commit fa0d6127c3
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkmodules.c
View File

@ -53,8 +53,6 @@ get_module_path (void)
{ {
const gchar *module_path_env; const gchar *module_path_env;
const gchar *exe_prefix; const gchar *exe_prefix;
const gchar *home_dir;
gchar *home_gtk_dir = NULL;
gchar *module_path; gchar *module_path;
gchar *default_dir; gchar *default_dir;
static gchar **result = NULL; static gchar **result = NULL;
@ -62,10 +60,6 @@ get_module_path (void)
if (result) if (result)
return result; return result;
home_dir = g_get_home_dir();
if (home_dir)
home_gtk_dir = g_build_filename (home_dir, ".gtk-3.0", NULL);
module_path_env = g_getenv ("GTK_PATH"); module_path_env = g_getenv ("GTK_PATH");
exe_prefix = g_getenv ("GTK_EXE_PREFIX"); exe_prefix = g_getenv ("GTK_EXE_PREFIX");
@ -74,20 +68,13 @@ get_module_path (void)
else else
default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL); default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
if (module_path_env && home_gtk_dir) if (module_path_env)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
module_path_env, home_gtk_dir, default_dir, NULL);
else if (module_path_env)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
module_path_env, default_dir, NULL); module_path_env, default_dir, NULL);
else if (home_gtk_dir)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
home_gtk_dir, default_dir, NULL);
else else
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
default_dir, NULL); default_dir, NULL);
g_free (home_gtk_dir);
g_free (default_dir); g_free (default_dir);
result = pango_split_file_list (module_path); result = pango_split_file_list (module_path);