From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 29 Jun 2004 11:25:10 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/trunk@74 d1b88da0-ebda-0310-925b-ed51d8... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3040548f418ebaa2d4ee02bbccec681722797320;p=scalable-opengroupware.org

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@74 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
new file mode 100644
index 00000000..a29e5942
--- /dev/null
+++ b/OGoContentStore/ChangeLog
@@ -0,0 +1,4 @@
+2004-06-29  Helge Hess  <helge.hess@opengroupware.org>
+
+	* created ChangeLog
+
diff --git a/OGoContentStore/OCSFolder.h b/OGoContentStore/OCSFolder.h
index 2d74c5e4..e1ff59fc 100644
--- a/OGoContentStore/OCSFolder.h
+++ b/OGoContentStore/OCSFolder.h
@@ -26,7 +26,7 @@
 #import <Foundation/NSObject.h>
 
 @class NSString, NSURL, NSNumber;
-@class OCSFolderManager, OCSFolderType;
+@class OCSFolderManager, OCSFolderType, OCSChannelManager;
 
 @interface OCSFolder : NSObject
 {
@@ -54,6 +54,9 @@
 - (NSURL    *)location;
 - (NSString *)folderTypeName;
 
+- (OCSFolderManager *)folderManager;
+- (OCSChannelManager *)channelManager;
+
 @end
 
 #endif /* __OGoContentStore_OCSFolder_H__ */
diff --git a/OGoContentStore/OCSFolder.m b/OGoContentStore/OCSFolder.m
index 373b127d..0995f860 100644
--- a/OGoContentStore/OCSFolder.m
+++ b/OGoContentStore/OCSFolder.m
@@ -85,6 +85,14 @@
   return self->folderTypeName;
 }
 
+
+- (OCSFolderManager *)folderManager {
+  return self->folderManager;
+}
+- (OCSChannelManager *)channelManager {
+  return [[self folderManager] channelManager];
+}
+
 /* description */
 
 - (NSString *)description {
diff --git a/OGoContentStore/OCSFolderManager.h b/OGoContentStore/OCSFolderManager.h
index 9f5d0fda..dc2117e3 100644
--- a/OGoContentStore/OCSFolderManager.h
+++ b/OGoContentStore/OCSFolderManager.h
@@ -49,8 +49,9 @@
 
 - (NSURL *)folderInfoLocation;
 
-/* checking connection */
+/* connection */
 
+- (OCSChannelManager *)channelManager;
 - (BOOL)canConnect;
 
 /* handling folder names */
diff --git a/OGoContentStore/OCSFolderManager.m b/OGoContentStore/OCSFolderManager.m
index 6e9e408a..d11ca83c 100644
--- a/OGoContentStore/OCSFolderManager.m
+++ b/OGoContentStore/OCSFolderManager.m
@@ -125,7 +125,7 @@ static const char *OCSPathColumnPattern     = "c_path%i";
   return [[self folderInfoLocation] ocsTableName];
 }
 
-/* checking connection */
+/* connection */
 
 - (OCSChannelManager *)channelManager {
   return self->channelManager;
@@ -235,8 +235,8 @@ static const char *OCSPathColumnPattern     = "c_path%i";
 	    __PRETTY_FUNCTION__, _record];
     return nil;
   }
-
-  locationString = [_record objectForKey:@"cLocation"];
+  
+  locationString = [_record objectForKey:@"cQuickLocation"];
   quickLocation = [locationString isNotNull] 
     ? [NSURL URLWithString:locationString]
     : nil;