Author: dbkr
Date: 2006-08-09 22:58:36 +0000 (Wed, 09 Aug 2006)
New Revision: 10011

Modified:
   trunk/apps/Freemail/src/freemail/Freemail.java
   trunk/apps/Freemail/src/freemail/MailMessage.java
   trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
Log:
Build #4: IMAP Compatability for Evolution - The "Even more fussy and broken 
that Outlook Express" mail client!


Modified: trunk/apps/Freemail/src/freemail/Freemail.java
===================================================================
--- trunk/apps/Freemail/src/freemail/Freemail.java      2006-08-09 21:50:27 UTC 
(rev 10010)
+++ trunk/apps/Freemail/src/freemail/Freemail.java      2006-08-09 22:58:36 UTC 
(rev 10011)
@@ -12,7 +12,7 @@
        // version info
        public static final int VER_MAJOR = 0;
        public static final int VER_MINOR = 1;
-       public static final int BUILD_NO = 3;
+       public static final int BUILD_NO = 4;
        public static final String VERSION_TAG = "Pet Shop";

        private static final String TEMPDIRNAME = "temp";

Modified: trunk/apps/Freemail/src/freemail/MailMessage.java
===================================================================
--- trunk/apps/Freemail/src/freemail/MailMessage.java   2006-08-09 21:50:27 UTC 
(rev 10010)
+++ trunk/apps/Freemail/src/freemail/MailMessage.java   2006-08-09 22:58:36 UTC 
(rev 10011)
@@ -190,7 +190,7 @@
                                // contination of previous line
                                if (parts == null || parts[1] == null) 
                                        continue;
-                               parts[1] += line.trim();
+                               parts[1] += " "+line.trim();
                        } else {
                                if (parts != null)
                                        this.addHeader(parts[0], parts[1]);

Modified: trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
===================================================================
--- trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java      2006-08-09 
21:50:27 UTC (rev 10010)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java      2006-08-09 
22:58:36 UTC (rev 10011)
@@ -445,15 +445,15 @@
                } else if (attr.startsWith("body.peek")) {
                        this.ps.print(a.substring(0, "body".length()));
                        this.ps.flush();
-                       attr = attr.substring("body.peek".length());
-                       return this.sendBody(mmsg, attr);
+                       a = a.substring("body.peek".length());
+                       return this.sendBody(mmsg, a);
                } else if (attr.startsWith("body")) {
                        mmsg.flags.set("\\Seen", true);

                        this.ps.print(a.substring(0, "body".length()));
                        this.ps.flush();
-                       attr = attr.substring("body".length());
-                       return this.sendBody(mmsg, attr);
+                       a = a.substring("body".length());
+                       return this.sendBody(mmsg, a);
                } else if (attr.startsWith("rfc822.header")) {
                        this.ps.print(a.substring(0, "rfc822.header".length()));
                        this.ps.flush();
@@ -520,7 +520,7 @@
                                for (int j = 0; j < fields.length; j++) {
                                        buf.append(mmsg.getHeaders(fields[j]));
                                }
-                               if (buf.length() == 0) buf.append("\r\n");
+                               buf.append("\r\n");
                        } else if (parts[i].equalsIgnoreCase("header")) {
                                // send all the header fields
                                try {


Reply via email to