git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1253 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 01b581ad8ea89d305e2d6490ab0510c0e15c1c3a..c7e3787f186c0c07175f5fe900dbda17033dbfcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
+       +folderWithSubscriptionReference:referenceinContainer:aContainer]):
+       fixed a leak.
+
        * UI/MailPartViewers/UIxMailPartHTMLViewer.m
        ([UIxMailPartHTMLViewer -_attachmentIds]): the reference was one
        character too short, which cause the images not to be displayed

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index cf6f1296eef0b95c71175d7578dcf289a8365f5d..a5118ea82b5bc1078e144ad8f3f8d32f678636ed 100644 (file)
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -42,6 +42,7 @@
 #import <GDLContentStore/NSURL+GCS.h>
 #import <SaxObjC/XMLNamespaces.h>
 #import <UI/SOGoUI/SOGoFolderAdvisory.h>
+#import "NSDictionary+Utilities.h"
 
 #import "NSArray+Utilities.h"
 #import "NSString+Utilities.h"
@@ -61,7 +62,7 @@ static NSString *defaultUserID = @"<default>";
 {
   id newFolder;
   NSArray *elements, *pathElements;
-  NSString *ocsPath, *objectPath, *login, *ocsName, *folderName;
+  NSString *path, *objectPath, *login, *ocsName, *folderName;
 
   elements = [reference componentsSeparatedByString: @":"];
   login = [elements objectAtIndex: 0];
@@ -72,12 +73,11 @@ static NSString *defaultUserID = @"<default>";
   else
     ocsName = @"personal";
 
-  ocsPath = [NSString stringWithFormat: @"/Users/%@/%@/%@",
-                     login, [pathElements objectAtIndex: 0], ocsName];
+  path = [NSString stringWithFormat: @"/Users/%@/%@/%@",
+                  login, [pathElements objectAtIndex: 0], ocsName];
   folderName = [NSString stringWithFormat: @"%@_%@", login, ocsName];
-  newFolder = [[self alloc] initWithName: folderName
-                           inContainer: aContainer];
-  [newFolder setOCSPath: ocsPath];
+  newFolder = [self objectWithName: folderName inContainer: aContainer];
+  [newFolder setOCSPath: path];
   [newFolder setOwner: login];
 
   return newFolder;
@@ -120,9 +120,9 @@ static NSString *defaultUserID = @"<default>";
     {
       ownerIdentity = [[SOGoUser userWithLogin: ownerLogin roles: nil]
                        primaryIdentity];
-      [displayName appendFormat: @" (%@ <%@>)",
-                  [ownerIdentity objectForKey: @"fullName"],
-                  [ownerIdentity objectForKey: @"email"]];
+      [displayName
+       appendString: [ownerIdentity keysWithFormat:
+                                      @" (%{fullName} <%{email}>)"]];
     }
   [displayName retain];
 }

diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 13cf5fc473865503662f77427093356625af36cc..e9d6a7e7d5bb268e4985d91741a7b59ea764623b 100644 (file)
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -221,7 +221,7 @@
        = [[parts objectsForKey: @"disposition"] objectEnumerator];
       while (!hasAttachment
             && (currentDisp = [dispositions nextObject]))
-         hasAttachment = ([currentDisp objectForKey: @"type"]);
+         hasAttachment = ([[currentDisp objectForKey: @"type"] length]);
     }
 
   return hasAttachment;
@@ -417,7 +417,8 @@
        /* only need to restrict if we have a lot */
        uids = [uids subarrayWithRange: r];
   
-      msgs = [[self clientObject] fetchUIDs: uids parts: [self fetchKeys]];
+      msgs = (NSDictionary *) [[self clientObject] fetchUIDs: uids
+                                                  parts: [self fetchKeys]];
       messages = [[msgs objectForKey: @"fetch"] retain];
     }
 
@@ -552,7 +553,7 @@
 {
   WORequest *request;
   NSString *specificMessage, *searchCriteria, *searchValue;
-  SOGoUserFolder *co;
+  SOGoMailFolder *co;
 
   request = [context request];