improved mail-exists check

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

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index e2ef8d5a7adfd430888bf712f4a916b6de0a4e1e..24bb3375806360bd4c958c443587a8642f03d56e 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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 80477ac7c9873f1dd9b072306fef0e92f59eec95..32ce2a3b061b278b2d917e308a82eb5f53023011 100644 (file)
--- 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 0a1f65146c9692a6dea8da9a1ec203d7beba8df3..8b9e48217bf3751145eccb7ff5a2f5b4b751f51e 100644 (file)
--- 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 82a24a5cffa3e468a5ad44a9efb750e569756021..e430593dc90014c600ebb98bfeab2f36e46c25e1 100644 (file)
--- 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];
       }