From 9c57907bcf73f4e2656904343ccc91fbaa7f2307 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 11 Nov 2008 03:04:22 +0000
Subject: [PATCH] reverted a change in SOGoAppointmentFolder.m which caused bad
 SQL to be generated

Monotone-Parent: 333349da689a5bd3ef8d70e672d7b0c0d29497a2
Monotone-Revision: 467ec5f1f0997ec12a4adbf6bc501ee81735cbdb

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-11-11T03:04:22
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Appointments/SOGoAppointmentFolder.m | 6 ++----
 SoObjects/SOGo/SOGoCache.m                     | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index fa0f85ad8..0b4a5f9dd 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -514,7 +514,7 @@ static Class sogoAppointmentFolderKlass = Nil;
 
   /* prepare mandatory fields */
 
-  sql = [[NSString stringWithFormat: @"%@ %@ %@ %@",
+  sql = [[NSString stringWithFormat: @"%@%@%@%@",
 		   dateSqlString, titleSqlString, componentSqlString,
 		   filterSqlString] substringFromIndex: 4];
 
@@ -1626,9 +1626,7 @@ static Class sogoAppointmentFolderKlass = Nil;
     {
       record = [records objectAtIndex: count];
       recordURL = [cnames objectForKey: [record objectForKey: @"c_name"]];
-
-      if (recordURL)
-	[components setObject: record forKey: recordURL];
+      [components setObject: record forKey: recordURL];
     }
 
   return components;
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index 3ca3e76b9..33f076967 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -113,6 +113,7 @@ static SOGoCache *sharedCache = nil;
 
 - (void) dealloc
 {
+#if 0
   [[NSDistributedNotificationCenter defaultCenter]
     removeObserver: self
     name: @"SOGoUserDefaultsHaveChanged"
@@ -122,6 +123,7 @@ static SOGoCache *sharedCache = nil;
     removeObserver: self
     name: @"SOGoUserSettingsHaveChanged"
     object: nil];
+#endif
 
   [cache release];
   [users release];