From ee001b16abb0205c051c173bef1bcd81026cad7f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 1 Dec 2009 16:46:44 +0000
Subject: [PATCH] Monotone-Parent: f74dd4ff04d7b8ee0ad50ddfe2f76ef51e3c964f
 Monotone-Revision: 1a0f96fd588d7f7edaa7a85a352ab39c2acbca70

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-01T16:46:44
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/SOGo/SOGoDefaults.plist   | 1 +
 SoObjects/SOGo/SOGoDomainDefaults.h | 2 ++
 SoObjects/SOGo/SOGoDomainDefaults.m | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index d57059a25..1e415e866 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -56,6 +56,7 @@
     SOGoOtherUsersFolderName = "Other Users";
     SOGoSharedFolderName = "Shared Folders";
 
+    SOGoCalendarDefaultCategoryColor = "#F0F0F0";
     SOGoCalendarShouldDisplayWeekend = YES;
     SOGoFreeBusyDefaultInterval = ( 7, 7 );
 
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index 98eb5bd07..14a0191ac 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -61,6 +61,8 @@
 - (NSArray *) contactsDefaultRoles;
 - (NSArray *) mailPollingIntervals;
 
+- (NSString *) calendarDefaultCategoryColor;
+
 - (NSArray *) freeBusyDefaultInterval;
 - (int) davCalendarStartTimeLimit;
 
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index e038e9e04..d0cffed24 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -27,7 +27,6 @@
 #import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#define NEEDS_DEFAULTS_SOURCE_INTERNAL 1
 #import "SOGoSystemDefaults.h"
 
 #import "SOGoDomainDefaults.h"
@@ -248,6 +247,11 @@
   return [self stringForKey: @"SOGoLDAPContactInfoAttribute"];
 }
 
+- (NSString *) calendarDefaultCategoryColor
+{
+  return [self stringForKey: @"SOGoCalendarDefaultCategoryColor"];
+}
+
 - (NSArray *) freeBusyDefaultInterval
 {
   return [self arrayForKey: @"SOGoFreeBusyDefaultInterval"];