fixed UIDNEXT/UNSEEN confusion

darcs-hash:20040707085122-5007d-f2644956c45b9eb87bd36fb2584141295ef27cfc.gz

diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java
index 346f007..28cd51a 100644 (file)
--- a/src/org/ibex/mail/protocol/IMAP.java
+++ b/src/org/ibex/mail/protocol/IMAP.java
@@ -61,7 +61,7 @@ public class IMAP {
         public void      close();
         public void      subscribe(String mailbox);
         public void      unsubscribe(String mailbox);
-        public int       seen(String mailbox);
+        public int       unseen(String mailbox);
         public int       recent(String mailbox);
         public int       count(String mailbox);
         public int       uidNext(String mailbox);
@@ -169,7 +169,7 @@ public class IMAP {
         public void expunge(Mailbox.Iterator it) { client.expunge(it.uid()); it.delete(); }
         public void subscribe(String mailbox) { }
         public void unsubscribe(String mailbox) { }
-        public int seen(String mailbox)        { return mailbox(mailbox, false).count(Query.seen()); }
+        public int unseen(String mailbox)      { return mailbox(mailbox, false).count(Query.not(Query.seen())); }
         public int recent(String mailbox)      { return mailbox(mailbox, false).count(Query.recent()); }
         public int count(String mailbox)       { return mailbox(mailbox, false).count(Query.all()); }
         public int uidNext(String mailbox)     { return mailbox(mailbox, false).uidNext(); }
@@ -287,10 +287,10 @@ public class IMAP {
                         for(int i=0; i<list.length; i++) {
                             String s = list[i].atom().toUpperCase();
                             if (s.equals("MESSAGES"))    response += "MESSAGES "    + api.count(mailbox);
-                            if (s.equals("RECENT"))      response += "RECENT "      + api.seen(mailbox);
-                            if (s.equals("UIDNEXT"))     response += "UNSEEN "      + api.recent(mailbox);
+                            if (s.equals("RECENT"))      response += "RECENT "      + api.recent(mailbox);
+                            if (s.equals("UIDNEXT"))     response += "UIDNEXT "     + api.uidNext(mailbox);
                             if (s.equals("UIDVALIDITY")) response += "UIDVALIDITY " + api.uidValidity(mailbox);
-                            if (s.equals("UNSEEN"))      response += "UIDNEXT "     + api.uidNext(mailbox);
+                            if (s.equals("UNSEEN"))      response += "UNSEEN "      + api.unseen(mailbox);
                         }
                         println("* STATUS " + selectedName + " (" + response + ")");
                         break;