From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 26 Aug 2004 12:32:13 +0000 (+0000)
Subject: enhanced OCS, fixed makefiles
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=435b1987d49dba89824552fe46cbc5b947ba2127;p=scalable-opengroupware.org

enhanced OCS, fixed makefiles


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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 81d3be3a..328b1edb 100644
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-26  Helge Hess  <helge.hess@skyrix.com>
+
+	* OCSFolderManager.m: added contact type model per default (v0.9.5)
+
 2004-08-25  Helge Hess  <helge.hess@skyrix.com>
 	
 	* GNUmakefile: automatically install OCSTypeModels (v0.9.4)
diff --git a/OGoContentStore/OCSFolderManager.m b/OGoContentStore/OCSFolderManager.m
index 4c395db0..e7762fa3 100644
--- a/OGoContentStore/OCSFolderManager.m
+++ b/OGoContentStore/OCSFolderManager.m
@@ -98,7 +98,7 @@ static const char *OCSPathColumnPattern     = "c_path%i";
     return nil;
   }
   if ((self = [super init])) {
-    OCSFolderType *cal;
+    OCSFolderType *cal, *contact;
     
     self->channelManager = [[OCSChannelManager defaultChannelManager] retain];
     self->folderInfoLocation = [_url retain];
@@ -110,10 +110,16 @@ static const char *OCSPathColumnPattern     = "c_path%i";
       return nil;
     }
     
-    cal = [[OCSFolderType alloc] initWithFolderTypeName:@"appointment"];
-    self->nameToType =
-      [[NSDictionary alloc] initWithObjectsAndKeys:cal, @"appointment", nil];
-    [cal release]; cal = nil;
+    /* register default folder types */
+    
+    cal     = [[OCSFolderType alloc] initWithFolderTypeName:@"appointment"];
+    contact = [[OCSFolderType alloc] initWithFolderTypeName:@"contact"];
+    self->nameToType = [[NSDictionary alloc] initWithObjectsAndKeys:
+					       cal,     @"appointment", 
+					       contact, @"contact", 
+					     nil];
+    [cal     release]; cal     = nil;
+    [contact release]; contact = nil;
   }
   return self;
 }
diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 36cb3fd6..a73270b5 100644
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=5
diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 5b066117..a5cee3e6 100644
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-26  Helge Hess  <helge.hess@skyrix.com>
+
+	* GNUmakefile.preamble: fixed superflous libjs (v0.9.8)
+
 2004-08-11  Helge Hess  <helge.hess@skyrix.com>
 
 	* added SOGoGroupPage and SOGoGroupsPage (default views for the group
diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble
index fc99f118..2b113fa5 100644
--- a/SOGo/Main/GNUmakefile.preamble
+++ b/SOGo/Main/GNUmakefile.preamble
@@ -13,5 +13,4 @@ ADDITIONAL_TOOL_LIBS += \
 	-lSOGo			\
 	-lSOGoLogic		\
 	-lOGoContentStore	\
-	-lGDLAccess		\
-	-ljs
+	-lGDLAccess
diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index cab297dc..28292b54 100644
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8