From b8d9e5f1e783f92cbae544c1daf5e4f57788276b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 19 Aug 2010 15:35:21 +0000
Subject: [PATCH] Monotone-Parent: d51fb546b2097f0d48a9b928bab71c9956c7c7f3
 Monotone-Revision: 3f6384d2d667032c851f2ee92c9eb1305dd8e483

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-19T15:35:21
Monotone-Branch: ca.inverse.sogo
---
 SOPE/GDLContentStore/ChangeLog   |  5 +++++
 SOPE/GDLContentStore/GCSFolder.h |  3 ---
 SOPE/GDLContentStore/GCSFolder.m | 32 ++++++++++++++------------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index 75341dc1c..0a4690994 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSFolder.m (-_channelManager): made method private.
+	(-folderManager): removed method.
+
 2010-06-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSFolderManager.m
diff --git a/SOPE/GDLContentStore/GCSFolder.h b/SOPE/GDLContentStore/GCSFolder.h
index 670059c37..b1370b6e2 100644
--- a/SOPE/GDLContentStore/GCSFolder.h
+++ b/SOPE/GDLContentStore/GCSFolder.h
@@ -94,9 +94,6 @@
 - (NSURL *) aclLocation;
 - (NSString *) folderTypeName;
 
-- (GCSFolderManager *) folderManager;
-- (GCSChannelManager *) channelManager;
-
 - (NSString *) storeTableName;
 - (NSString *) quickTableName;
 - (NSString *) aclTableName;
diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 2f856d418..4b26a124a 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -192,11 +192,8 @@ static NSArray *contentFieldNames = nil;
   return folderTypeName;
 }
 
-- (GCSFolderManager *)folderManager {
-  return folderManager;
-}
-- (GCSChannelManager *)channelManager {
-  return [[self folderManager] channelManager];
+- (GCSChannelManager *)_channelManager {
+  return [folderManager channelManager];
 }
 
 - (NSString *)storeTableName {
@@ -216,28 +213,28 @@ static NSArray *contentFieldNames = nil;
 /* channels */
 
 - (EOAdaptorChannel *)acquireStoreChannel {
-  return [[self channelManager] acquireOpenChannelForURL:[self location]];
+  return [[self _channelManager] acquireOpenChannelForURL:[self location]];
 }
 - (EOAdaptorChannel *)acquireQuickChannel {
-  return [[self channelManager] acquireOpenChannelForURL:[self quickLocation]];
+  return [[self _channelManager] acquireOpenChannelForURL:[self quickLocation]];
 }
 - (EOAdaptorChannel *)acquireAclChannel {
-  return [[self channelManager] acquireOpenChannelForURL:[self aclLocation]];
+  return [[self _channelManager] acquireOpenChannelForURL:[self aclLocation]];
 }
 
 - (void)releaseChannel:(EOAdaptorChannel *)_channel {
-  [[self channelManager] releaseChannel:_channel];
+  [[self _channelManager] releaseChannel:_channel];
   if (debugOn) [self debugWithFormat:@"released channel: %@", _channel];
 }
 
 - (BOOL)canConnectStore {
-  return [[self channelManager] canConnect:[self location]];
+  return [[self _channelManager] canConnect:[self location]];
 }
 - (BOOL)canConnectQuick {
-  return [[self channelManager] canConnect:[self quickLocation]];
+  return [[self _channelManager] canConnect:[self quickLocation]];
 }
 - (BOOL)canConnectAcl {
-  return [[self channelManager] canConnect:[self quickLocation]];
+  return [[self _channelManager] canConnect:[self quickLocation]];
 }
 
 /* errors */
@@ -278,12 +275,12 @@ static NSArray *contentFieldNames = nil;
 /* operations */
 
 - (NSArray *)subFolderNames {
-  return [[self folderManager] listSubFoldersAtPath:[self path]
-			       recursive:NO];
+  return [folderManager listSubFoldersAtPath:[self path]
+                                   recursive:NO];
 }
 - (NSArray *)allSubFolderNames {
-  return [[self folderManager] listSubFoldersAtPath:[self path]
-			       recursive:YES];
+  return [folderManager listSubFoldersAtPath:[self path]
+                                   recursive:YES];
 }
 
 - (GCSTableRequirement) _tableRequirementForFields: (NSArray *) fields
@@ -515,7 +512,6 @@ static NSArray *contentFieldNames = nil;
 	{
 	  [self errorWithFormat:@"%s: cannot execute quick-fetch SQL '%@': %@", 
 		__PRETTY_FUNCTION__, sql, error];
-	  [self releaseChannel: channel];
 	  results = nil;
 	}
       else
@@ -529,8 +525,8 @@ static NSArray *contentFieldNames = nil;
 
 	  /* release channels */
   
-	  [self releaseChannel: channel];
 	}
+      [self releaseChannel: channel];
 //         NSLog(@"/running query");
     }
   else