From 39cfaae6ec0f30e691e659868d0395095a76d847 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 24 Mar 2009 13:45:32 +0000
Subject: [PATCH] reversed patch

Monotone-Parent: 6e583ecae28dc18e9f816d9d06c33fc5b047103a
Monotone-Revision: 3a3837b97a228bb1e5d1e55f692eaaded56ed2f7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-24T13:45:32
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/ChangeLog                        | 11 -----------
 SOPE/NGCards/iCalDailyRecurrenceCalculator.m  |  1 -
 SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m |  1 -
 UI/Scheduler/UIxCalListingActions.m           |  4 +++-
 sogo.spec                                     |  7 ++-----
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 09e7074bc..ed8f6fcdc 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,14 +1,3 @@
-2009-03-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
-
-	* iCalWeeklyRecurrenceCalculator.m
-	([iCalWeeklyRecurrenceCalculator
-	-recurrenceRangesWithinCalendarDateRange:_r]): same as below.
-
-	* iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator
-	-recurrenceRangesWithinCalendarDateRange:_r]): autorelease
-	currentStartDate when instantiated from a copy of firDate, to
-	avoid a leak.
-
 2009-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* CardElement.m ([CardElement -setParent:aParent]): no longer
diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
index 233f531e1..7cd4d6849 100644
--- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
@@ -80,7 +80,6 @@
     }
 
   currentStartDate = [firStart copy];
-  [currentStartDate autorelease];
   ranges = [NSMutableArray array];
   i = 1;
 
diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
index 6b673464e..f5303deaf 100644
--- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
@@ -87,7 +87,6 @@
     }
  
   currentStartDate = [firStart copy];
-  [currentStartDate autorelease];
   ranges = [NSMutableArray array];
   byDayMask = [rrule byDayMask];
   i = 1;
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 82d950c9c..85ed4e5d3 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -90,7 +90,7 @@ static NSArray *tasksFields = nil;
       endDate = nil;
       ASSIGN (request, newRequest);
       user = [[self context] activeUser];
-      ASSIGN (dateFormatter, [user dateFormatterInContext: context]);
+      dateFormatter = [user dateFormatterInContext: context];
       ASSIGN (userTimeZone, [user timeZone]);
       dayBasedView = NO;
     }
@@ -103,6 +103,8 @@ static NSArray *tasksFields = nil;
   [dateFormatter release];
   [request release];
   [componentsData release];
+  [startDate release];
+  [endDate release];
   [userTimeZone release];
   [super dealloc];
 }
diff --git a/sogo.spec b/sogo.spec
index 315d2141a..044f9af60 100644
--- a/sogo.spec
+++ b/sogo.spec
@@ -222,11 +222,8 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi
 /sbin/chkconfig --add sogod
 
 %preun
-if [ "$1" == "0" ]
-then
-  /sbin/chkconfig --del sogod
-  /sbin/service sogod stop > /dev/null 2>&1
-fi
+/sbin/chkconfig --del sogod
+/sbin/service sogod stop > /dev/null 2>&1
 
 %postun
 if test "$1" = "0"