From 2e5c0a288f7c54cce7e0327ddbbd160f242758f1 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 22 Oct 2005 14:36:31 +0000
Subject: fixes

---
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index b44d6d1..6c1f664 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,5 +1,12 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.2.5 ************
+
+Bugfixes in KO/Pi, KA/Pi and OM/Pi.
+Added possibility to disable auto saving in KO/Pi.
+How to disable it? Good question! Next question, please?
+
+
 ********** VERSION 2.2.4 ************
 
 KO/Pi alarm applet: Made font smaller and added a dealy before starting KO/Pi to avoid problems accessing data storage when an alarm did wake up the Z.
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index a6c12e4..7c813cc 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -262,18 +262,19 @@ void SMTPwrapper::connect_server()
         result = 0;
         failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err));
     }  
-    if ( mailesmtp_ehlo(m_smtp) != MAILSMTP_NO_ERROR ) {
-        qDebug("Smpt: ehlo failed ");
-        result = 0;
-    }
-    else {  
+    //LR 05-10-22 : qDebug("no elo any more ");
+   //  if ( false /*mailesmtp_ehlo(m_smtp) != MAILSMTP_NO_ERROR */) {
+//         qDebug("Smpt: ehlo failed "); 
+//         result = 0;
+//     }
+//     else {  
         //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN);
         if ( m_smtp->auth & MAILSMTP_AUTH_LOGIN &&  m_smtp->auth & MAILSMTP_AUTH_PLAIN ) {
             qDebug("Smpt: Using MAILSMTP_AUTH_LOGIN ");
             m_smtp->auth -= MAILSMTP_AUTH_PLAIN;
             //qDebug("Smpt: auth is %d -- %d %d",m_smtp->auth, MAILSMTP_AUTH_LOGIN, MAILSMTP_AUTH_PLAIN);
         }
-    }
+        //   }
     
     if (result==1 && m_SmtpAccount->getLogin() ) {
         ; // odebug << "smtp with auth" << oendl; 
--
cgit v0.9.0.2