fix newmail hack

[org.ibex.mail.git] / src / org / ibex / mail / target / Script.java

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index 0206e90..46c58f3 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -4,6 +4,7 @@
 
 package org.ibex.mail.target;
 import org.ibex.js.*;
+import org.ibex.io.*;
 import org.ibex.util.*;
 import org.ibex.mail.*;
 import org.ibex.mail.filter.*;
@@ -16,7 +17,7 @@ public class Script extends JS.Obj implements Target {
     private static final JS.Method METHOD = new JS.Method();
 
     private static Script root = null;
-    private static final String DEFAULT_CONF = File.separatorChar + "etc" + File.separatorChar + "org.ibex.mail.conf";
+    private static final String DEFAULT_CONF = Mailbox.STORAGE_ROOT + "conf" + File.separatorChar + "inbound.js";
     public static Script root() {
         try {
             if (root == null) root = new Script(System.getProperty("ibex.mail.conf", DEFAULT_CONF));
@@ -135,7 +136,7 @@ public class Script extends JS.Obj implements Target {
             } catch (IOException e) { throw new JSExn(e.toString()); }
             case "mail.my.mailbox":
                 FileBasedMailbox root = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT, true);
-                return root.slash("user", true).slash("megacz", true).slash("newmail", true);
+                return root.slash("user", true).slash("megacz", true);
             case "mail.list": return METHOD;
             //#end
             return super.get(name);