From e1010aab6ddde7d07398211a87f46ff22a4a93bd Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 20 Jul 2005 16:12:54 +0000 Subject: [PATCH] improved mail-exists check git-svn-id: http://svn.opengroupware.org/SOGo/trunk@858 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Mailer/ChangeLog | 3 +++ SOGo/SoObjects/Mailer/SOGoMailObject.m | 5 +++++ SOGo/SoObjects/Mailer/Version | 2 +- SOGo/UI/MailerUI/UIxMailView.m | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index e2ef8d5a..24bb3375 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,5 +1,8 @@ 2005-07-20 Helge Hess + * SOGoMailObject.m: improved -doesMailExist check (do not refetch if + the coreinfo is available anyways) (v0.9.116) + * v0.9.115 * SOGoMailObject.m: do not use clientObject when fetching the diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.m b/SOGo/SoObjects/Mailer/SOGoMailObject.m index 80477ac7..32ce2a3b 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailObject.m +++ b/SOGo/SoObjects/Mailer/SOGoMailObject.m @@ -170,6 +170,11 @@ static BOOL debugSoParts = NO; static NSArray *existsKey = nil; id msgs; + if (self->coreInfos != nil) /* if we have coreinfos, we can use them */ + return [self->coreInfos isNotNull]; + + /* otherwise fetch something really simple */ + if (existsKey == nil) /* we use size, other suggestions? */ existsKey = [[NSArray alloc] initWithObjects:@"RFC822.SIZE", nil]; diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index 0a1f6514..8b9e4821 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=114 +SUBMINOR_VERSION:=116 # v0.9.114 requires libNGMime v4.5.229 # v0.9.114 requires libNGExtensions v4.5.165 diff --git a/SOGo/UI/MailerUI/UIxMailView.m b/SOGo/UI/MailerUI/UIxMailView.m index 82a24a5c..e430593d 100644 --- a/SOGo/UI/MailerUI/UIxMailView.m +++ b/SOGo/UI/MailerUI/UIxMailView.m @@ -176,7 +176,7 @@ static NSString *mailETag = nil; if ((s = [[[self context] request] headerForKey:@"if-none-match"])) { if ([s rangeOfString:mailETag].length > 0) { /* not perfectly correct */ /* client already has the proper entity */ - [self logWithFormat:@"MATCH: %@ (tag %@)", s, mailETag]; + // [self logWithFormat:@"MATCH: %@ (tag %@)", s, mailETag]; [[[self context] response] setStatus:304 /* Not Modified */]; return [[self context] response]; } -- 2.39.5