From 505d9621d3c94f3b796cb177120c0eaee60b83ae Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 8 Feb 2007 21:55:47 +0000 Subject: [PATCH] see changelog Monotone-Parent: 712040e55618bec7c04be7fc95173aadc966c25b Monotone-Revision: 7e8193075678dc0552c70be8e294ff1b3ce46b40 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2007-02-08T21:55:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailFolder.m | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b5cfc959..a3db79d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-08 Ludovic Marcotte + + * SoObjects/Mailer/SOGoMailFolder.m + Priorize the look of folders before doing + the one on messages. + 2007-02-08 Wolfgang Sourdeau * SoObjects/SOGo/NSArray+Utilities.m: added an implementation of diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index d6bf24cd3..cf537404a 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -294,15 +294,15 @@ static BOOL useAltNamespace = NO; */ return [self lookupImap4Message:_key inContext:_ctx]; } + + obj = [self lookupImap4Folder:_key inContext:_ctx]; + if (obj != nil) + return obj; /* check attributes directly bound to the app */ if ((obj = [super lookupName:_key inContext:_ctx acquire:NO])) return obj; - obj = [self lookupImap4Folder:_key inContext:_ctx]; - if (obj != nil) - return obj; - /* return 404 to stop acquisition */ return _acquire ? [NSException exceptionWithHTTPStatus:404 /* Not Found */]