From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 14 Aug 2007 16:38:13 +0000 (+0000)
Subject: fixed OGo bug #1897
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df6435b6fc22cf9f2230f117dd63a3a27889a3c;p=sope

fixed OGo bug #1897


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1525 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 800c7b89..a7be6b5e 100644
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+	* NGMail: fixed some connection states in NGSmtpClient (OGo bug #1897)
+	  (v4.7.250)
+
 2007-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
 	* NGImap4: fixed an encoding issue on gstep-base/Cocoa (OGo bug #1885)
diff --git a/sope-mime/NGMail/ChangeLog b/sope-mime/NGMail/ChangeLog
index 56a78242..b26ca173 100644
--- a/sope-mime/NGMail/ChangeLog
+++ b/sope-mime/NGMail/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+	* NGSmtpClient.m: properly change connection states (fixes OGo bug
+	  #1897)
+
 2005-12-13  Helge Hess  <helge.hess@opengroupware.org>
 
 	* NGMimeMessageParser.m: moved NSData QP category to own file
diff --git a/sope-mime/NGMail/NGSmtpClient.m b/sope-mime/NGMail/NGSmtpClient.m
index d7f23357..3a8807d7 100644
--- a/sope-mime/NGMail/NGSmtpClient.m
+++ b/sope-mime/NGMail/NGSmtpClient.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2007 SKYRIX Software AG
 
   This file is part of SOPE.
 
@@ -403,6 +403,7 @@
       NSLog(@"SMTP(MAIL FROM): expected reply code %i, got code %i ..",
             NGSmtpActionCompleted, [reply code]);
     }
+    [self gotoState:NGSmtpState_TRANSACTION];
     return YES;
   }
   return NO;
@@ -450,6 +451,7 @@
     reply = [self receiveReply];
     if (self->isDebuggingEnabled) [NGTextErr writeFormat:@"S: %@\n", reply];
     if ([reply isPositive]) {
+      [self gotoState:NGSmtpState_connected];
       return YES;
     }
     else {
diff --git a/sope-mime/Version b/sope-mime/Version
index fbc4ca5b..358da7ed 100644
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=7
-SUBMINOR_VERSION:=249
+SUBMINOR_VERSION:=250
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34