gedit r6848 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Tue Jan 13 21:02:32 2009
New Revision: 6848
URL: http://svn.gnome.org/viewvc/gedit?rev=6848&view=rev

Log:
2009-01-13  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-dirs.[ch]:
	* gedit-plugins-engine:
	Do not look for plugin loaders in the home dir.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-dirs.c
   trunk/gedit/gedit-dirs.h
   trunk/gedit/gedit-plugins-engine.c

Modified: trunk/gedit/gedit-dirs.c
==============================================================================
--- trunk/gedit/gedit-dirs.c	(original)
+++ trunk/gedit/gedit-dirs.c	Tue Jan 13 21:02:32 2009
@@ -61,6 +61,22 @@
 }
 
 gchar *
+gedit_dirs_get_user_plugins_dir (void)
+{
+	gchar *config_dir;
+	gchar *plugin_dir;
+
+	config_dir = gedit_dirs_get_user_config_dir ();
+
+	plugin_dir = g_build_filename (config_dir,
+				       "plugins",
+				       NULL);
+	g_free (config_dir);
+	
+	return plugin_dir;
+}
+
+gchar *
 gedit_dirs_get_user_accels_file ()
 {
 	gchar *accels = NULL;

Modified: trunk/gedit/gedit-dirs.h
==============================================================================
--- trunk/gedit/gedit-dirs.h	(original)
+++ trunk/gedit/gedit-dirs.h	Tue Jan 13 21:02:32 2009
@@ -32,6 +32,8 @@
 
 gchar		*gedit_dirs_get_user_cache_dir		(void);
 
+gchar		*gedit_dirs_get_user_plugins_dir	(void);
+
 gchar		*gedit_dirs_get_user_accels_file	(void);
 
 gchar		*gedit_dirs_get_gedit_data_dir		(void);

Modified: trunk/gedit/gedit-plugins-engine.c
==============================================================================
--- trunk/gedit/gedit-plugins-engine.c	(original)
+++ trunk/gedit/gedit-plugins-engine.c	Tue Jan 13 21:02:32 2009
@@ -164,74 +164,62 @@
 }
 
 static void
-load_all_real (GeditPluginsEngine *engine,
-               const gchar        *dir,
-               const gchar        *envname,
-               const gchar        *envdefault,
-               const gchar        *suffix,
-	       LoadDirCallback     callback,
-	       gpointer            userdata)
+load_all_plugins (GeditPluginsEngine *engine)
 {
-	gchar *config_dir;
+	gchar *plugin_dir;
 	const gchar *pdirs_env = NULL;
-	gchar **pdirs;
-	int i;
-
-	/* load user's plugins */
-	config_dir = gedit_dirs_get_user_config_dir ();
-	
-	if (config_dir != NULL)
-	{
-		gchar *pdir;
-		gboolean ret = TRUE;
 
-		pdir = g_build_filename (config_dir,
-					 dir,
-					 NULL);
-		g_free (config_dir);
+	/* load user plugins */
+	plugin_dir = gedit_dirs_get_user_plugins_dir ();
+	if (g_file_test (plugin_dir, G_FILE_TEST_IS_DIR))
+	{
+		load_dir_real (engine,
+			       plugin_dir,
+			       PLUGIN_EXT,
+			       load_plugin_info,
+			       NULL);
 
-		if (g_file_test (pdir, G_FILE_TEST_IS_DIR))
-			ret = load_dir_real (engine, pdir, suffix, callback, userdata);
-		
-		g_free (pdir);
-		
-		if (!ret)
-			return;
 	}
-	
-	if (envname)
-		pdirs_env = g_getenv (envname);
+	g_free (plugin_dir);
 
-	if (pdirs_env == NULL)
-		pdirs_env = envdefault;
+	/* load system plugins */
+	pdirs_env = g_getenv ("GEDIT_PLUGINS_PATH");
 
-	gedit_debug_message (DEBUG_PLUGINS, "%s=%s", envname, pdirs_env);
-	pdirs = g_strsplit (pdirs_env, G_SEARCHPATH_SEPARATOR_S, 0);
+	gedit_debug_message (DEBUG_PLUGINS, "GEDIT_PLUGINS_PATH=%s", pdirs_env);
 
-	for (i = 0; pdirs[i] != NULL; i++)
+	if (pdirs_env != NULL)
 	{
-		if (!load_dir_real (engine, pdirs[i], suffix, callback, userdata))
-			break;
-	}
+		gchar **pdirs;
+		gint i;
 
-	g_strfreev (pdirs);
-}
+		pdirs = g_strsplit (pdirs_env, G_SEARCHPATH_SEPARATOR_S, 0);
 
-static void
-load_all_plugins (GeditPluginsEngine *engine)
-{
-	gchar *plugin_dir;
+		for (i = 0; pdirs[i] != NULL; i++)
+		{
+			if (!load_dir_real (engine,
+					    pdirs[i],
+					    PLUGIN_EXT,
+					    load_plugin_info,
+					    NULL))
+			{
+				break;
+			}
+		}
 
-	plugin_dir = gedit_dirs_get_gedit_plugins_dir ();
+		g_strfreev (pdirs);
+	}
+	else
+	{
+		plugin_dir = gedit_dirs_get_gedit_plugins_dir ();
 
-	load_all_real (engine, 
-		       "plugins", 
-		       "GEDIT_PLUGINS_PATH", 
-		       plugin_dir,
-		       PLUGIN_EXT,
-		       load_plugin_info,
-		       NULL);
-	g_free (plugin_dir);
+		load_dir_real (engine,
+			       plugin_dir,
+			       PLUGIN_EXT,
+			       load_plugin_info,
+			       NULL);
+
+		g_free (plugin_dir);
+	}
 }
 
 static guint
@@ -471,9 +459,7 @@
 
 		/* loader could not be found in the hash, try to find it by 
 		   scanning */
-		load_all_real (engine, 
-			       "plugin-loaders", 
-			       NULL, 
+		load_dir_real (engine, 
 			       loader_dir,
 			       LOADER_EXT,
 			       (LoadDirCallback)load_loader,