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

See ChangeLog

Browse source 
Monotone-Parent: 28c05bb78bef144b921bd396d723df3160a6cd68
Monotone-Revision: baff8f841a09a6ce7b85defe87388086513344c4

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-03-11T13:39:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2009-03-11 13:39:20 +00:00
parent 208d480790
commit 7664654e42
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2009-03-11 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
We now correctly escape caracters that can be
present in the filename prior to initalizing
the NSURL instance.
2009-03-09 Ludovic Marcotte <lmarcotte@inverse.ca> 2009-03-09 Ludovic Marcotte <lmarcotte@inverse.ca>
* Documentation/SOGo Installation Guide.odt * Documentation/SOGo Installation Guide.odt

11
SoObjects/Appointments/SOGoAppointmentFolder.m
View file

@ -1592,7 +1592,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
for (count = 0; count < max; count++) for (count = 0; count < max; count++)
{ {
url = [urls objectAtIndex: count]; url = [NSString stringWithFormat: @"%@/%@",
[[urls objectAtIndex: count] stringByDeletingLastPathComponent],
[[[urls objectAtIndex: count] lastPathComponent] stringByEscapingURL]];
componentURL = [[NSURL URLWithString: url relativeToURL: baseURL] componentURL = [[NSURL URLWithString: url relativeToURL: baseURL]
standardizedURL]; standardizedURL];
componentURLPath = [componentURL absoluteString]; componentURLPath = [componentURL absoluteString];
@ -1600,8 +1602,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
!= NSNotFound) != NSNotFound)
{ {
urlComponents = [componentURLPath componentsSeparatedByString: @"/"]; urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
cName = [urlComponents objectAtIndex: [urlComponents count] - 1]; cName = [[urls objectAtIndex: count] lastPathComponent];
[cNames setObject: url forKey: cName]; [cNames setObject: [urls objectAtIndex: count] forKey: cName];
} }
} }
@ -1726,8 +1728,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
buffer = [[NSMutableString alloc] initWithCapacity: max*512]; buffer = [[NSMutableString alloc] initWithCapacity: max*512];
for (count = 0; count < max; count++) for (count = 0; count < max; count++)
{ {
currentComponent currentComponent = [components objectForKey: [urls objectAtIndex: count]];
= [components objectForKey: [urls objectAtIndex: count]];
if (currentComponent) if (currentComponent)
[self appendObject: currentComponent [self appendObject: currentComponent
properties: properties properties: properties