merge of '11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052'

and 'd999a58fea7c083b81da56a7f2274d857b44eb7a'

Monotone-Parent: 11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052
Monotone-Parent: d999a58fea7c083b81da56a7f2274d857b44eb7a
Monotone-Revision: 1e1b1ea27969183ec35f1d755b26adeadb3874c0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-09-23T17:18:32
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-09-23 17:18:32 +00:00
commit d5957ac5c5
1 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,6 @@
/* UIxCalendarProperties.m - this file is part of SOGo
*
* Copyright (C) 2008 Inverse inc.
* Copyright (C) 2008-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@ -181,6 +181,7 @@
settings = [[context activeUser] userSettings];
calendarSettings = [settings objectForKey: @"Calendar"];
rc = nil;
if (calendarSettings)
{