From 10968a8f9ab22ab1aee49d5f570669a468870fa0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 5 Sep 2007 15:33:31 +0000 Subject: [PATCH] Monotone-Parent: 0be0c535500e7a08745c9f2d3ffe2b5c0c183d2e Monotone-Revision: 4c9c451ed285e35bcbdb393184764a8aeee61e28 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-05T15:33:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/Scheduler/UIxCalendarSelector.m | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c36be425e..1a506694e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-09-05 Wolfgang Sourdeau + * UI/Scheduler/UIxCalendarSelector.m ([UIxCalendarSelector + -currentCalendarLogin]): replace css-unsafe characters with _. + * UI/SOGoUI/UIxComponent.m ([UIxComponent -shortUserNameForDisplay]): simplified method. ([-user]): removed method since [context activeUser] is as useful. diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m index 7205bfec7..1beef4b43 100644 --- a/UI/Scheduler/UIxCalendarSelector.m +++ b/UI/Scheduler/UIxCalendarSelector.m @@ -152,13 +152,19 @@ colorForNumber (unsigned int number) - (NSString *) currentCalendarLogin { NSArray *parts; + NSMutableString *login; + login = [NSMutableString string]; parts = [[currentCalendarFolder objectForKey: @"folder"] componentsSeparatedByString: @":"]; + [login appendString: (([parts count] > 1) + ? [parts objectAtIndex: 0] + : [[context activeUser] login])]; + [login replaceString: @"." withString: @"_"]; + [login replaceString: @"#" withString: @"_"]; + [login replaceString: @"@" withString: @"_"]; - return (([parts count] > 1) - ? [parts objectAtIndex: 0] - : [[context activeUser] login]); + return login; } - (NSString *) currentCalendarStyle