fixed OGo bug #1899

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1534 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index cbe449f2581a3f06273dde97238087d881094aa5..8ede885aec0ba0001f2d1b1ddb2c0ba9c6841955 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-29  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+       * NGImap4: added support for non-system IMAP4 flags (OGo bug #1899)
+         (v4.7.254)
+
 2007-08-29  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGMime: some gstep-base hackaround (OGo bug #1890) (v4.7.253)

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index e3afe0120b89e0e6c6a74f4717fbc3485a35635d..1987048a95df8ab65e4f87444ed7eed1e87f3528 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-29  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+       * NGImap4Client.m: added support for non-system IMAP4 flags (eg
+         $Forwarded) (fixes OGo bug #1899)
+
 2007-08-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGImap4Connection.m: fixed some issue with gnustep-base and the

diff --git a/sope-mime/NGImap4/NGImap4Client.m b/sope-mime/NGImap4/NGImap4Client.m
index 666e23f73e793ce159a7ad57683d7e1fd579574e..1e8ba2135c2f45759207c28156dc80c3094ff0fa 100644 (file)
--- a/sope-mime/NGImap4/NGImap4Client.m
+++ b/sope-mime/NGImap4/NGImap4Client.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2007 SKYRIX Software AG
 
   This file is part of SOPE.
 
@@ -108,6 +108,7 @@ static int          LogImapEnabled     = -1;
 static int          PreventExceptions  = -1;
 static BOOL         fetchDebug         = NO;
 static BOOL         ImapDebugEnabled   = NO;
+static NSArray      *Imap4SystemFlags  = nil;
 
 - (BOOL)useSSL {
   return self->useSSL;
@@ -136,6 +137,9 @@ static BOOL         ImapDebugEnabled   = NO;
   }
   if (ImapClients == NULL)
     ImapClients = calloc(MaxImapClients + 2, sizeof(id));
+
+  Imap4SystemFlags = [[NSArray alloc] initWithObjects: @"seen", @"answered",
+                                     @"deleted", @"draft", nil];
 }
 
 /* constructors */
@@ -1382,7 +1386,10 @@ static BOOL         ImapDebugEnabled   = NO;
   cnt  = 0;
   enumerator = [_flags objectEnumerator];
   while ((obj = [enumerator nextObject])) {
-    objs[cnt] = [@"\\" stringByAppendingString:obj];
+    if ([Imap4SystemFlags containsObject: [obj lowercaseString]])
+      objs[cnt] = [@"\\" stringByAppendingString:obj];
+    else
+      objs[cnt] = obj;
     cnt++;
   }
   result = [NSArray arrayWithObjects:objs count:cnt];

diff --git a/sope-mime/Version b/sope-mime/Version
index fdbbd82d304dfe3ba8f1e96c38ee23a8dfe3e453..2bbf29bba8b62d8c8fda4d1ca4f41c7aa2bd62a8 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=7
-SUBMINOR_VERSION:=253
+SUBMINOR_VERSION:=254
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34