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 81d3be3a640b583545bdb5ce50575ba2cdd22f2a..328b1edb0dd17366b5054bd43ef24b75e101781a 100644 (file)
--- 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 4c395db0e8487c0eda5fb50212e2a8ebe7c7bd0e..e7762fa32be032a9aa54a90a0cd9cd0e90544387 100644 (file)
--- 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 36cb3fd6ce87d039dbab4482cd05fec04d27eb3d..a73270b540e9c1a42a13cdd38d47451568de19a8 100644 (file)
--- 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 5b066117cad3365c9587495acb54b5b3d6eba880..a5cee3e6d35959974a455f6e8e8567b5e2243636 100644 (file)
--- 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 fc99f1188a47282d86836c17c85fdc66aaa20644..2b113fa59a3f3482fc4bf308cb0c79ba796b8eb5 100644 (file)
--- 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 cab297dce179f93daddb8c8e20c17af86c0b5d3b..28292b549059af8a6800e33ac74ed5ab727067ed 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8