From 52fdf2e8e8c18fb8227bd45d74c74c20d850dbe4 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 8 Nov 2007 23:08:23 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1253
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                      |  4 ++++
 SoObjects/SOGo/SOGoGCSFolder.m | 18 +++++++++---------
 UI/MailerUI/UIxMailListView.m  |  7 ++++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01b581ad..c7e3787f 100644
--- 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 cf6f1296..a5118ea8 100644
--- 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 13cf5fc4..e9d6a7e7 100644
--- 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];
 
-- 
2.39.5