merge of '2104587fdbf1ef7f22f0a0075957fc03091bfc19'

and '82068f0557914f395561a92071bea0e6791ac884'

Monotone-Parent: 2104587fdbf1ef7f22f0a0075957fc03091bfc19
Monotone-Parent: 82068f0557914f395561a92071bea0e6791ac884
Monotone-Revision: 68efb362b1c9c00b393ee099cf802bf8e59899b3

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-08-29T20:04:31
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2008-08-29 20:04:31 +00:00
commit d1a0696644
3 changed files with 363 additions and 306 deletions

View file

@ -1,3 +1,9 @@
2008-08-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailView.m ([UIxMailView
-appendToResponse:_responseinContext:_ctx]): logout from the imap
connectin once the response has been appended.
2008-08-29 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject

File diff suppressed because it is too large Load diff

View file

@ -26,6 +26,8 @@
#import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSException+misc.h>
#import <NGExtensions/NSString+misc.h>
#import <NGImap4/NGImap4Client.h>
#import <NGImap4/NGImap4Connection.h>
#import <NGImap4/NGImap4Envelope.h>
#import <NGImap4/NGImap4EnvelopeAddress.h>
#import <SoObjects/Mailer/SOGoMailObject.h>
@ -209,7 +211,7 @@ static NSString *mailETag = nil;
inContext: (WOContext *) _ctx
{
UIxMailRenderingContext *mctx;
SOGoMailFolder *mailFolder;
NGImap4Connection *conn;
if (mailETag != nil)
[[_ctx response] setHeader:mailETag forKey:@"etag"];
@ -224,8 +226,8 @@ static NSString *mailETag = nil;
[[_ctx popMailRenderingContext] reset];
mailFolder = [[self clientObject] container];
[mailFolder unselect];
conn = [[self clientObject] imap4Connection];
[[conn client] logout];
}
@end /* UIxMailView */