From 1169e642e74c7f3da638da6aa2323edb99c01003 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 6 Jan 2010 19:16:55 +0000 Subject: [PATCH] Monotone-Parent: b81c5b1570ede0294a166ba113ea0402585963ef Monotone-Revision: 3153e42cfafdd9f2a07623a78af07f4b4e837945 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-06T19:16:55 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxTimeDateControl.m | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/UI/Scheduler/UIxTimeDateControl.m b/UI/Scheduler/UIxTimeDateControl.m index beb6eb23e..dca9fce1d 100644 --- a/UI/Scheduler/UIxTimeDateControl.m +++ b/UI/Scheduler/UIxTimeDateControl.m @@ -74,10 +74,10 @@ SOGoUserDefaults *ud; int minuteValue; - ud = [[context activeUser] userDefaults]; if (!_date) _date = [NSCalendarDate date]; + ud = [[context activeUser] userDefaults]; [_date setTimeZone: [ud timeZone]]; [self _setDate: _date]; @@ -252,8 +252,6 @@ unsigned _year, _month, _day, _hour, _minute, _second; SOGoUserDefaults *ud; - ud = [[context activeUser] userDefaults]; - /* call super, so that the form values are applied on the popups */ [super takeValuesFromRequest:_rq inContext:_ctx]; @@ -269,9 +267,10 @@ _minute = [[self minute] intValue]; _second = [[self second] intValue]; - d = [NSCalendarDate dateWithYear: _year month:_month day:_day - hour:_hour minute:_minute second:_second - timeZone: [ud timeZone]]; + ud = [[context activeUser] userDefaults]; + d = [NSCalendarDate dateWithYear: _year month: _month day: _day + hour: _hour minute: _minute second: _second + timeZone: [ud timeZone]]; [self _setDate: d]; } }