From f5ea84b8e87a4a4b97c5931e81d6a2155f1b3d5e Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 11 Jun 2010 12:39:11 +0000
Subject: [PATCH] Monotone-Parent: ffa4675e7af6fe5e9930558a290322abb62a2106
 Monotone-Revision: 5c8902d0c3987966dfebba9bf7712481cd8a4d0e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-11T12:39:11
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  6 ++++++
 UI/Scheduler/UIxCalFilterPanel.m | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f49e26d68..a837ccaf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalFilterPanel.m (+initialize): commented out
+	the "All Events" option as this could cause a delay too long in IE
+	when drawing the list.
+
 2010-06-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoDAVAuthenticator.m (-checkLogin:password:):
diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m
index 541ba2a13..c9ebf5be9 100644
--- a/UI/Scheduler/UIxCalFilterPanel.m
+++ b/UI/Scheduler/UIxCalFilterPanel.m
@@ -39,13 +39,14 @@ static NSArray *filters = nil;
 + (void) initialize
 {
   static NSString *quals[]
-    = {@"view_all", @"view_today", @"view_next7", @"view_next14",
+    = { // @"view_all",
+       @"view_today", @"view_next7", @"view_next14",
        @"view_next31", @"view_thismonth", @"view_future",
        @"view_selectedday" };
 
   if (!filters)
     {
-      filters = [NSArray arrayWithObjects: quals count: 8];
+      filters = [NSArray arrayWithObjects: quals count: 7];
       [filters retain];
     }
 }
@@ -63,8 +64,8 @@ static NSArray *filters = nil;
 
 - (void) dealloc
 {
-  [self->searchCriteria release];
-  [self->searchText release];
+  [searchCriteria release];
+  [searchText release];
   [super dealloc];
 }
 
@@ -72,12 +73,12 @@ static NSArray *filters = nil;
 
 - (void) setSearchText: (NSString *)_txt
 {
-  ASSIGNCOPY(self->searchText, _txt);
+  ASSIGN (searchText, _txt);
 }
 
 - (void) setSearchCriteria: (NSString *)_txt
 {
-  ASSIGNCOPY(self->searchText, _txt);
+  ASSIGN (searchText, _txt);
 }
 
 - (NSString *) searchText