From a3e630034b376e493a1c24c1b883b10af39f4bdd Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 27 Sep 2004 23:34:08 +0000 Subject: [PATCH] fixed an edge condition git-svn-id: http://svn.opengroupware.org/SOGo/trunk@323 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Mailer/ChangeLog | 4 ++++ SOGo/SoObjects/Mailer/SOGoMailBaseObject.m | 8 +++++--- SOGo/SoObjects/Mailer/Version | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index 89e3cd50..24571823 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-09-28 Helge Hess + + * SOGoMailAccount.m: be graceful if the IMAP4 login failed (v0.9.7) + 2004-09-27 Helge Hess * v0.9.6 diff --git a/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m b/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m index 56e0e55d..baffb482 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m +++ b/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m @@ -71,8 +71,10 @@ return nil; } - base = [self baseImap4URL]; - sn = [[base path] stringByAppendingPathComponent:sn]; + if ((base = [self baseImap4URL]) == nil) + return nil; + + sn = [[base path] stringByAppendingPathComponent:sn]; self->imap4URL = [[NSURL alloc] initWithString:sn relativeToURL:base]; return self->imap4URL; } @@ -97,7 +99,7 @@ } - (NSString *)imap4Password { - return @""; + return [[NSUserDefaults standardUserDefaults] stringForKey:@"hackpwd"]; } - (NGImap4Client *)imap4ClientForURL:(NSURL *)_url password:(NSString *)_pwd { diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index 0eb47da3..cab297dc 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 -- 2.39.5