Re: Alpha-11 blockers

On Thu, 19 Feb 2004, Meredydd wrote:

> (*)	That plugin directory move thing needs dealing with
--------------- Patch Begins ----------------------
Index: core/src/main.c
===================================================================
--- core/src/main.c	(revision 291)
+++ core/src/main.c	(working copy)
@@ -35,8 +35,10 @@
 #include "contactlist.h"
 #include "util.h"
 
+#define FORCE_NEW_PLUGINS_DIR
 #ifndef PLUGINS_DIR
-# define PLUGINS_DIR "/usr/local/share/eb-lite/plugins"
+# define OLD_PLUGINS_DIR "/usr/local/share/eb-lite/plugins"
+# define PLUGINS_DIR "/usr/local/lib/eb-lite"
 #endif
 
 //#ifndef VERSION
@@ -211,6 +213,15 @@
   plugins_init();
 
   eb_put_default(registry, "config/plugin_dir", PLUGINS_DIR);
+#ifdef FORCE_NEW_PLUGINS_DIR
+  if (!strcmp(eb_get_value(registry, "config/plugin_dir")), OLD_PLUGINS_DIR)
+  {
+	// For now, force the new plugin location
+	// We should remove this code once we have some expectation that the user
+	// might have changed it, but right now they won't have done that, anyways
+    eb_put_default(registry, "config/plugin_dir", PLUGINS_DIR);
+  }
+#endif /* FORCE_NEW_PLUGINS_DIR */
 
   load_local_accounts();
   load_plugins(eb_get_value(registry, "config/plugin_dir"));
--------------- Patch Ends ------------------------

-- 
Craig West         Ph: (416) 666-1645	|  It's not a bug,
[email protected]              	|  It's a feature...