fixed an edge condition

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@323 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 89e3cd50f4aac0694262639afa1a246f333bd27d..24571823ef663cda75c7c576d45ef5425dc48a3a 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-28  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoMailAccount.m: be graceful if the IMAP4 login failed (v0.9.7)
+
 2004-09-27  Helge Hess  <helge.hess@opengroupware.org>
 
        * v0.9.6

diff --git a/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m b/SOGo/SoObjects/Mailer/SOGoMailBaseObject.m
index 56e0e55db08a77f4ad22f9f694c0f6f6f9288267..baffb482d535794cd1a099b606c08160706c5643 100644 (file)
--- 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 0eb47da345be1d4c8ac5a363234ca3f2c77473cb..cab297dce179f93daddb8c8e20c17af86c0b5d3b 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7