dont try to create a FileBasedMailbox for STORAGE_ROOT/users

darcs-hash:20041018052454-5007d-4c3ff9228728465fb8c1f0e1fcf5166cbf1b25ff.gz

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index 5898f55..7a58382 100644 (file)
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -32,7 +32,8 @@ public class Main implements Listener {
         public Account login(String user, String pass) {
             if (user.indexOf("@gmail.com") != -1) return GMail.getGMail(user, pass);
             if (!EtcPasswd.verify(user, pass)) return null;
-            final Mailbox root = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT, true).slash("user", true);
+            final Mailbox root =
+                FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT + "/user", true);
             return new Account(user, null, root.slash(user, true)){
                     public Mailbox getMailbox(Class protocol) {
                         if (protocol == NNTP.class) {

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index bb25080..1f822a7 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -120,7 +120,8 @@ public class Script extends Target {
                 }
             }
             if (name.equals("mail.my.mailbox")) {
-               return FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT, true).slash("user", true).slash("megacz", true).slash("newmail", true);
+                FileBasedMailbox root = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT, true);
+                return root.slash("user", true).slash("megacz", true).slash("newmail", true);
            }
             return super.get(name);
         }