LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: 06d8a080e505b11bad76b3afa0c1ffa5aa02bc23
Monotone-Revision: 5c327b5b1200ffed4317126e637f1e5a4a6947fb

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-12-23T20:14:53
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2009-12-23 20:14:53 +00:00
parent 8de7496f55
commit cbc87fc9ab
5 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-12-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Scheduler/UIxCalView.m
Don't call -configureFormatters in -init as it'll
invoke labelForKey prior to setPage: - resulting
in the wrong resources manager being selected.
This fixes: http://www.scalableogo.org/bugs/view.php?id=286
2009-12-22 Ludovic Marcotte <lmarcotte@inverse.ca>
* Removed all the Kolab-related stuff (more specifically,

2
UI/Common/WODirectAction+SOGo.m
View File

@ -1,6 +1,6 @@
/* WODirectAction+SOGo.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
* Copyright (C) 2007-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*

2
UI/Scheduler/UIxCalMainView.h
View File

@ -1,6 +1,6 @@
/* UIxCalMainView.h - this file is part of SOGo
*
* Copyright (C) 2006 Inverse inc.
* Copyright (C) 2006-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*

2
UI/Scheduler/UIxCalMonthView.h
View File

@ -1,6 +1,6 @@
/* UIxCalMonthView.h - this file is part of SOGo
*
* Copyright (C) 2006 Inverse inc.
* Copyright (C) 2006-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*

38
UI/Scheduler/UIxCalView.m
View File

@ -74,7 +74,6 @@
= [[SOGoAptFormatter alloc] initWithDisplayTimeZone: timeZone];
privateAptTooltipFormatter
= [[SOGoAptFormatter alloc] initWithDisplayTimeZone: timeZone];
[self configureFormatters];
componentsData = [NSMutableDictionary new];
}
@ -182,37 +181,6 @@
ASSIGN (appointment, _apt);
}
// - (void) setAppointment:(id) _apt
// {
// NSString *mailtoChunk;
// NSString *myEmail;
// NSString *partmails;
// ASSIGN(appointment, _apt);
// /* cache some info about apt for faster access */
// mailtoChunk = [_apt valueForKey: @"orgmail"];
// myEmail = [self emailForUser];
// if ([mailtoChunk rangeOfString: myEmail].length > 0)
// {
// aptFlags.isMyApt = YES;
// aptFlags.canAccessApt = YES;
// }
// else
// {
// aptFlags.isMyApt = NO;
// partmails = [_apt valueForKey: @"partmails"];
// if ([partmails rangeOfString: myEmail].length)
// aptFlags.canAccessApt = YES;
// else
// aptFlags.canAccessApt
// = ([[_apt valueForKey: @"classification"] intValue]
// == iCalAccessPublic);
// }
// }
- (id) appointment
{
return appointment;
@ -248,6 +216,9 @@
- (SOGoAptFormatter *) aptFormatter
{
if (![aptFormatter titlePlaceholder])
[self configureFormatters];
if (aptFlags.canAccessApt)
return aptFormatter;
return privateAptFormatter;
@ -255,6 +226,9 @@
- (SOGoAptFormatter *) aptTooltipFormatter
{
if (![aptTooltipFormatter titlePlaceholder])
[self configureFormatters];
if (aptFlags.canAccessApt)
return aptTooltipFormatter;
return privateAptTooltipFormatter;