Monotone-Parent: 7b5f08442cc8a464b29abb66c14ba679da84d277

Monotone-Revision: 504efed918c1affc532bdcc00196349809e53460

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-02T02:57:12
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-09-02 02:57:12 +00:00
parent ad5221ed0e
commit 2a61987803
6 changed files with 29 additions and 14 deletions

View File

@ -1,5 +1,31 @@
2008-09-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailView.m ([UIxMailView
-appendToResponse:_responseinContext:_ctx]): no longer invoke
[NGImap4Client logout], since this is now handled by the
NGImap4Connection manager (or not).
* UI/MailerUI/UIxMailActions.m ([UIxMailActions
-markMessageUnreadAction]): no longer make use of [SOGoMailFolder
unselect].
([UIxMailActions -markMessageReadAction]): idem.
* SoObjects/Mailer/SOGoMailFolder.m ([-unselect]): removed method
since we no longer need it.
* SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject
-dealloc]): release "imap4". If the IMAP4 connection pooling is
disabled, the object will otherwise never be released.
* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
+initialize]): use the user default "SOGoFallbackIMAP4Server" to
override the value of "serverName" from the actual user settings.
Fallback to "localhost" if value is unset.
* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
-imap4URLString]): use the value of SOGoFallbackIMAP4Server, as
mentionne above.
* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -from]): retain the
initialized value of from, otherwise we create a future zombie.

View File

@ -57,6 +57,7 @@ static BOOL debugOn = YES;
- (void) dealloc
{
[imap4URL release];
[imap4 release];
[super dealloc];
}
@ -121,7 +122,7 @@ static BOOL debugOn = YES;
imap4 = [[self mailManager] connectionForURL: [self imap4URL]
password: [self imap4Password]];
if (imap4)
[imap4 retain];
[imap4 retain];
else
[self errorWithFormat:@"Could not connect IMAP4."];
}

View File

@ -64,7 +64,6 @@ typedef enum {
- (void) expungeLastMarkedFolder;
- (NSException *) expunge;
- (NSException *) unselect;
/* flags */

View File

@ -283,16 +283,6 @@ static BOOL aclConformsToIMAPExt = NO;
return [[self imap4Connection] expungeAtURL: [self imap4URL]];
}
- (NSException *) unselect
{
NGImap4Client *client;
client = [[self imap4Connection] client];
[client unselect];
return nil;
}
- (void) markForExpunge
{
NSUserDefaults *ud;

View File

@ -151,7 +151,6 @@
if (!response)
{
mailFolder = [[self clientObject] container];
[mailFolder unselect];
response = [self responseWith204];
}
@ -167,7 +166,6 @@
if (!response)
{
mailFolder = [[self clientObject] container];
[mailFolder unselect];
response = [self responseWith204];
}

View File

@ -135,6 +135,7 @@ static NSArray *infoKeys = nil;
{
identity = [[context activeUser] primaryIdentity];
from = [identity keysWithFormat: @"%{fullName} <%{email}>"];
[from retain];
}
return from;