rev 7652 - kde-extras/mailody/trunk/debian/patches

[Tom Albers]

Author: tomalbers-guest
Date: 2007-10-25 18:40:24 +0000 (Thu, 25 Oct 2007)
New Revision: 7652

Modified:
   kde-extras/mailody/trunk/debian/patches/12_fix_smtp_gmail.diff
Log:
Update patch. Works now.


Modified: kde-extras/mailody/trunk/debian/patches/12_fix_smtp_gmail.diff
===================================================================
--- kde-extras/mailody/trunk/debian/patches/12_fix_smtp_gmail.diff	2007-10-25 18:30:44 UTC (rev 7651)
+++ kde-extras/mailody/trunk/debian/patches/12_fix_smtp_gmail.diff	2007-10-25 18:40:24 UTC (rev 7652)
@@ -1,5 +1,5 @@
 --- i/mailody-0.5.0/mailody/src/smtp.cpp	2007-04-02 23:41:07.000000000 +0200
-+++ mailody/src/smtp.cpp	2007-10-25 20:26:31.000000000 +0200
++++ mailody/src/smtp.cpp	2007-10-25 20:37:50.000000000 +0200
 @@ -150,7 +150,7 @@
              dataIn.find("AUTH") < dataIn.find("LOGIN"))
              m_authPossible = true;
@@ -9,7 +9,7 @@
              slotTLS();
      }
      else if (m_currentCommand == TLS)
-@@ -192,8 +192,14 @@
+@@ -192,15 +192,21 @@
          {
              emit error(i18n("Authentication did not succeed"));
              return;
@@ -17,10 +17,27 @@
 +        else
 +        {
 +            m_currentCommand = From;
-+            m_socket->write("MAIL FROM:" + m_email);
++            m_socket->write("MAIL FROM:<" + m_email + ">");
          }
  
 +
          // Please remember, this can be the response to hte Helo or to
          // a previous Pass command.... TLS already send the headers, so
          // that should pass through....
+         if (dataIn.find("250 ") > -1 || m_tls || !m_authNeeded)
+         {
+             m_currentCommand = From;
+-            m_socket->write("MAIL FROM:" + m_email);
++            m_socket->write("MAIL FROM:<" + m_email + ">");
+         }
+     }
+     else if (m_currentCommand == From || !m_tos.isEmpty())
+@@ -227,7 +233,7 @@
+         Address.fromUnicodeString( to,"UTF-8");
+         lastEmail = Address.email();
+ 
+-        m_socket->write("RCPT TO:" + lastEmail);
++        m_socket->write("RCPT TO:<" + lastEmail+">");
+     }
+     else if (m_currentCommand == Rcpt )
+     {