minor GMail fixes

darcs-hash:20040912020816-5007d-fed90ca6299efc59884c99521dec332dbbf152ac.gz

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index 2753f30..0a1baa4 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -92,16 +92,19 @@ public class GMail extends Account {
 
         public void      check() { query(query); }
         public void      select(String mailbox, boolean examineOnly) {
+            String oldquery = query;
+            if (mailbox.equalsIgnoreCase("inbox")) {
+                query = "?search=inbox&start=0&view=tl";
+                if (!query.equals(oldquery)) check();
+                return;
+            }
             for(int i=0; i<labels.length; i++) {
                 if (labels[i].equals(mailbox)) {
-                    String oldquery = query;
-                    if (mailbox.equalsIgnoreCase("inbox")) query = "?search=inbox&start=0&view=tl";
-                    else query = "?search=cat&cat="+mailbox+"&inbox&start=0&view=tl";
+                    query = "?search=cat&cat="+mailbox+"&inbox&start=0&view=tl";
                     if (!query.equals(oldquery)) check();
                     return;
                 }
             }
-            String oldquery = query;
             query = "?search=query&q="+URLEncoder.encode(mailbox)+"&start=0&view=tl";
             if (!query.equals(oldquery)) check();
         }

diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java
index 2981f30..627070e 100644 (file)
--- a/src/org/ibex/mail/protocol/IMAP.java
+++ b/src/org/ibex/mail/protocol/IMAP.java
@@ -245,9 +245,10 @@ public class IMAP {
                 api.setClient(this);
             } else {
                 Account account = (Account)ret;
-                root = account.getMailbox(IMAP.class);
-                inbox = root.slash("INBOX", false);
-                if (inbox == null) inbox = root;
+                ((MailboxWrapper)api).root = root = account.getMailbox(IMAP.class);
+                Log.warn(this, "logged in, root="+root);
+                ((MailboxWrapper)api).inbox = inbox = root.slash("INBOX", false);
+                if (inbox == null) ((MailboxWrapper)api).inbox = inbox = root;
             }
         }