[gtk+] Don't load binary modules from the home directory by default



commit fa0d6127c322c4ebd3d37bedf19cf9d2fc8bf00d
Author: William Jon McCann <jmccann redhat com>
Date:   Fri Apr 27 10:52:13 2012 -0400

    Don't load binary modules from the home directory by default
    
    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

 gtk/gtkmodules.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 0308ce8..4d92fa0 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -53,8 +53,6 @@ get_module_path (void)
 {
   const gchar *module_path_env;
   const gchar *exe_prefix;
-  const gchar *home_dir;
-  gchar *home_gtk_dir = NULL;
   gchar *module_path;
   gchar *default_dir;
   static gchar **result = NULL;
@@ -62,10 +60,6 @@ get_module_path (void)
   if (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");
   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
 
@@ -74,20 +68,13 @@ get_module_path (void)
   else
     default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
 
-  if (module_path_env && home_gtk_dir)
-    module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
-				module_path_env, home_gtk_dir, default_dir, NULL);
-  else if (module_path_env)
+  if (module_path_env)
     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 				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
     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 				default_dir, NULL);
 
-  g_free (home_gtk_dir);
   g_free (default_dir);
 
   result = pango_split_file_list (module_path);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]