diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index ed8f6fcdc..09e7074bc 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,14 @@ +2009-03-24 Wolfgang Sourdeau + + * 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 * CardElement.m ([CardElement -setParent:aParent]): no longer diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 7cd4d6849..233f531e1 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -80,6 +80,7 @@ } currentStartDate = [firStart copy]; + [currentStartDate autorelease]; ranges = [NSMutableArray array]; i = 1; diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index f5303deaf..6b673464e 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -87,6 +87,7 @@ } 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 85ed4e5d3..82d950c9c 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]; - dateFormatter = [user dateFormatterInContext: context]; + ASSIGN (dateFormatter, [user dateFormatterInContext: context]); ASSIGN (userTimeZone, [user timeZone]); dayBasedView = NO; } @@ -103,8 +103,6 @@ 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 044f9af60..315d2141a 100644 --- a/sogo.spec +++ b/sogo.spec @@ -222,8 +222,11 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -/sbin/chkconfig --del sogod -/sbin/service sogod stop > /dev/null 2>&1 +if [ "$1" == "0" ] +then + /sbin/chkconfig --del sogod + /sbin/service sogod stop > /dev/null 2>&1 +fi %postun if test "$1" = "0"