Re: [evolution-patches] calendar properties window plugin hooks

[David Trowbridge <David Trowbridge Colorado edu>]

At the moment, the system path is picked up only if
EVOLUTION_PLUGIN_PATH isn't set. It's a pretty trivial fix, and I've
attached a diff. I'm not sure this is still desirable (may want to
include ~/.eplug always as well, rather than having that depend on the
env variable), but it fixes the more important problem.

On Fri, 2004-10-15 at 11:31 -0400, JP Rosevear wrote:
> On Thu, 2004-10-14 at 15:27 -0600, David Trowbridge wrote:
> > It requires a plugin to be installed for webcal properties to function
> > correctly - i've added a plugins/ directory to the evolution root (as
> > per some discussion on irc a week or so back). This will probably mean
> > changing EPlugin to load plugins from both the system directory and the
> > user EVOLUTION_PLUGIN_PATH, rather than just one or the other.
> 
> How come?  Right now by default stuff is grabbed from the system plugin
> path and ~/.eplug.
> 
> -JP

Index: e-util/e-plugin.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-plugin.c,v
retrieving revision 1.6
diff -u -r1.6 e-plugin.c
--- e-util/e-plugin.c	8 Oct 2004 07:00:11 -0000	1.6
+++ e-util/e-plugin.c	15 Oct 2004 17:44:50 -0000
@@ -181,15 +181,13 @@
 		ep_parent_class = g_type_class_ref(G_TYPE_OBJECT);
 		type = g_type_register_static(G_TYPE_OBJECT, "EPlugin", &info, 0);
 
-		/* Add paths in the environment variable or default global and user specific paths */
-		path = g_strdup(getenv("EVOLUTION_PLUGIN_PATH"));
-		if (path == NULL) {
-			/* Add the global path */
-			e_plugin_add_load_path(EVOLUTION_PLUGINDIR);
+		/* Add the global path */
+		e_plugin_add_load_path(EVOLUTION_PLUGINDIR);
 
+		/* Add paths in the environment variable */
+		path = g_strdup(getenv("EVOLUTION_PLUGIN_PATH"));
+		if (path == NULL)
 			path = g_build_filename(g_get_home_dir(), ".eplug", NULL);
-		}
-		
 		p = path;
 		while ((col = strchr(p, ':'))) {
 			*col++ = 0;