merge of 'baf4c7f8461dec960162ae0da21047d576421c14'

and 'fefb3f05edb2d5e5ba63661ae145d0369e47b444'

Monotone-Parent: baf4c7f8461dec960162ae0da21047d576421c14
Monotone-Parent: fefb3f05edb2d5e5ba63661ae145d0369e47b444
Monotone-Revision: 9ef1fb2c66953b8ada0d55d0eec183621a71ebab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-11T20:58:35
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactFoldersView.m

@@ -52,8 +52,7 @@
   WORequest *request;
 
   folders = [self clientObject];
-  action = [NSString stringWithFormat: @"../%@/%@",
-                     [folders defaultSourceName],
+  action = [NSString stringWithFormat: @"../personal/%@",
                      actionName];
 
   request = [[self context] request];
@@ -82,7 +81,11 @@
 
   name = [self queryParameterForKey: @"name"];
   if ([name length] > 0)
-    response = [[self clientObject] newFolderWithName: name];
+    {
+      response = [[self clientObject] newFolderWithName: name];
+      if (!response)
+	response = [self responseWith204];
+    }
   else
     response = [NSException exceptionWithHTTPStatus: 400
                             reason: @"The name is missing"];
@@ -111,8 +114,7 @@
     {
       uid = [currentContact objectForKey: @"c_uid"];
       if (uid && ![results objectForKey: uid])
-	[results setObject: currentContact
-		 forKey: uid];
+	[results setObject: currentContact forKey: uid];
       currentContact = [folderResults nextObject];
     }
 }
@@ -202,7 +204,7 @@
   gcsFolders = [NSMutableArray new];
   [gcsFolders autorelease];
 
-  contactSubfolders = [[contactFolders contactFolders] objectEnumerator];
+  contactSubfolders = [[contactFolders subFolders] objectEnumerator];
   currentContactFolder = [contactSubfolders nextObject];
   while (currentContactFolder)
     {

UI/Contacts/UIxContactsListViewContainer.m

@@ -29,6 +29,7 @@
 
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Contacts/SOGoContactFolder.h>
+#import <SoObjects/Contacts/SOGoContactFolders.h>
 
 #import "UIxContactsListViewContainer.h"
 
@@ -115,7 +116,7 @@
 
   folderContainer = [[self clientObject] container];
 
-  return [folderContainer contactFolders];
+  return [folderContainer subFolders];
 }
 
 - (NSString *) currentContactFolderId