From 85c9c6e402880a87b3433ba60f84f5e69d62b28b Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 14 Nov 2008 00:55:00 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 81c4e4d41c6464180cf83e11f19c2148e6351324 Monotone-Revision: 0400894ebb0d9305dae91e6efb9e8a62a36e6d5b Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-11-14T00:55:00 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 ++ .../SOGoAptMailDutchICalReply.html | 2 +- .../SOGoAptMailDutchICalReply.wod | 9 +++++++++ .../SOGoAptMailEnglishICalReply.html | 2 +- .../SOGoAptMailFrenchICalReply.html | 2 +- .../SOGoAptMailFrenchICalReply.wod | 9 +++++++++ .../SOGoAptMailGermanICalReply.html | 2 +- .../SOGoAptMailGermanICalReply.wod | 9 +++++++++ .../SOGoAptMailItalianICalReply.html | 2 +- .../SOGoAptMailItalianICalReply.wod | 9 +++++++++ .../SOGoAptMailSpanishICalReply.html | 2 +- .../SOGoAptMailSpanishICalReply.wod | 9 +++++++++ SoObjects/SOGo/SOGoCache.m | 4 ++-- 13 files changed, 55 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a59d9c76..c24bd1cc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ contain an ':' in them * SoObjects/Appointments/iCalPerson+SOGo.m Fixed the check for quoted SENT-BY + * Updated the iCal invitation replies to take + the SENT-BY into account. 2008-11-11 Ludovic Marcotte diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html index 6eb7b0bf5..8cb7ba49e 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/> -<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd<#HasNotAcceptedNotDeclined>not yet decided upon. +<#IsBody><#organizer/><#HasSentBy>(sent by <#sentBy/>) heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd<#HasNotAcceptedNotDeclined>not yet decided upon. diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod index 2ade0637f..aebf86c26 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod @@ -28,3 +28,12 @@ HasDeclined: WOConditional { HasNotAcceptedNotDeclined: WOConditional { condition = hasNotAcceptedNotDeclined; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html index f1c04f883..4d9397882 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Event Invitation Reply: <#summary/> -<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>) <#HasAccepted>accepted<#HasDeclined>declined<#HasNotAcceptedNotDeclined>not yet decided upon your event invitation. +<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>) <#HasAccepted>accepted<#HasDeclined>declined<#HasNotAcceptedNotDeclined>not yet decided upon your event invitation. diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html index e6f65ab18..e83939934 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Réponse à l'invitation : «<#summary/>» -<#IsBody><#attendee/> a <#HasAccepted>accepté<#HasDeclined>refusé<#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à votre invitation. \ No newline at end of file +<#IsBody><#attendee/> <#HasSentBy>(envoyé par <#sentBy/>) a <#HasAccepted>accepté<#HasDeclined>refusé<#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à votre invitation. diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod index 2ade0637f..aebf86c26 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod @@ -28,3 +28,12 @@ HasDeclined: WOConditional { HasNotAcceptedNotDeclined: WOConditional { condition = hasNotAcceptedNotDeclined; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html index 2baf03b65..d242cbf4d 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwort Termineinladung: <#summary/> -<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert<#HasDeclined>abgelehnt<#HasNotAcceptedNotDeclined>not yet decided upon. \ No newline at end of file +<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) hat Ihre Termineinladung <#HasAccepted>akzeptiert<#HasDeclined>abgelehnt<#HasNotAcceptedNotDeclined>not yet decided upon. diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod index 2ade0637f..aebf86c26 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod @@ -28,3 +28,12 @@ HasDeclined: WOConditional { HasNotAcceptedNotDeclined: WOConditional { condition = hasNotAcceptedNotDeclined; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html index 19f05c571..68a9774e6 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Re: Appuntemento : "<#summary/>" -<#IsBody><#attendee/> ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasNotAcceptedNotDeclined>not yet decided upon l'invito al proprio evento. +<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasNotAcceptedNotDeclined>not yet decided upon l'invito al proprio evento. diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod index 2ade0637f..aebf86c26 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod @@ -28,3 +28,12 @@ HasDeclined: WOConditional { HasNotAcceptedNotDeclined: WOConditional { condition = hasNotAcceptedNotDeclined; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html index 0fbb62387..6f82c321c 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Respuesta a la invitación al evento: <#summary/> -<#IsBody><#attendee/> ha <#HasAccepted>aceptado<#HasDelined>rechazado<#HasNotAcceptedNotDeclined>not yet decided upon su invitación al evento. \ No newline at end of file +<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) ha <#HasAccepted>aceptado<#HasDelined>rechazado<#HasNotAcceptedNotDeclined>not yet decided upon su invitación al evento. diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod index 2ade0637f..aebf86c26 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod @@ -28,3 +28,12 @@ HasDeclined: WOConditional { HasNotAcceptedNotDeclined: WOConditional { condition = hasNotAcceptedNotDeclined; } + +HasSentBy: WOConditional { + condition = hasSentBy; +} + +sentBy: WOString { + value = sentBy; + escapeHTML = NO; +} \ No newline at end of file diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m index e10da72e5..5b5473d89 100644 --- a/SoObjects/SOGo/SOGoCache.m +++ b/SoObjects/SOGo/SOGoCache.m @@ -83,8 +83,8 @@ static SOGoCache *sharedCache = nil; s_userDefaults = [[NSMutableDictionary alloc] init]; s_userSettings = [[NSMutableDictionary alloc] init]; - - // We register ourself for notifications + + // We register ourself for notifications [[NSDistributedNotificationCenter defaultCenter] addObserver: self selector: @selector(_userDefaultsHaveChanged:)