From 65964c5b7169e0bafa7f61e45e18ba9f54204a55 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 28 Sep 2009 13:19:48 +0000 Subject: [PATCH 1/5] Monotone-Parent: 1aaea249ad1360b144fa338a55f11cad2cf930d0 Monotone-Revision: 93ac3544873becf72157e54ddeac053456390045 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-09-28T13:19:48 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoUser.m | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb687ed88..905f41def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-28 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoUser.m (+initialize): avoid a crash when + SOGoProfileURL is not set. + 2009-09-27 Ludovic Marcotte * Reworked the UIxMailPartSignedViewer to inherit diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index fc49e66b2..6ceb75d83 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -146,7 +146,8 @@ _timeValue (NSString *key) @" was renamed to 'SOGoProfileURL'"]; } } - SOGoProfileURL = [[NSURL alloc] initWithString: profileURL]; + if (profileURL) + SOGoProfileURL = [[NSURL alloc] initWithString: profileURL]; } if (!fallbackIMAP4Server) ASSIGN (fallbackIMAP4Server, From 02bf8acc977a7c81762705990cada12db2a6e0c6 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 28 Sep 2009 13:20:04 +0000 Subject: [PATCH 2/5] Monotone-Parent: 93ac3544873becf72157e54ddeac053456390045 Monotone-Revision: 5d13be9c64742eda95c52fa0f0205eb99849d1d1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-09-28T13:20:04 Monotone-Branch: ca.inverse.sogo --- .../UIxMailPartSignedViewer.wox | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox index 89b277006..7733e0d60 100644 --- a/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox +++ b/UI/Templates/MailPartViewers/UIxMailPartSignedViewer.wox @@ -5,18 +5,15 @@ xmlns:const="http://www.skyrix.com/od/constant" xmlns:rsrc="OGo:url" xmlns:label="OGo:label" - class="mailer_plaincontent signed" + class="signed" const:id="signedMessage" var:valid="validSignature" - var:error="validationMessage" -> -
- -
- -
- -
+ var:error="validationMessage"> + +
+ +
+ From 9a04b3bdfd2ee5d7f7ea93b4e5c461eb76ef9538 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 28 Sep 2009 13:20:13 +0000 Subject: [PATCH 3/5] Monotone-Parent: 5d13be9c64742eda95c52fa0f0205eb99849d1d1 Monotone-Revision: e5b6580e3ea6df5bbc9bde0db8b2a350b69e3eb8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-09-28T13:20:13 Monotone-Branch: ca.inverse.sogo --- .../UIxMailPartMixedViewer.wox | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox index d8ab883da..f3280139b 100644 --- a/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox +++ b/UI/Templates/MailPartViewers/UIxMailPartMixedViewer.wox @@ -1,17 +1,16 @@ +
-
- -
- -
- -
+ xmlns:var="http://www.skyrix.com/od/binding" + xmlns:const="http://www.skyrix.com/od/constant" + xmlns:rsrc="OGo:url" + xmlns:label="OGo:label" + > + +
+ +
+
From 1648d063af91d2606a83f3e68852a84131982189 Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 28 Sep 2009 13:25:14 +0000 Subject: [PATCH 4/5] Fixed errors in ab import/export Monotone-Parent: e5b6580e3ea6df5bbc9bde0db8b2a350b69e3eb8 Monotone-Revision: 2494a7d12f52699f7ee338f8403ab926c0c118ab Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-09-28T13:25:14 Monotone-Branch: ca.inverse.sogo --- .../Appointments/SOGoAppointmentFolder.m | 1 + UI/Contacts/UIxContactFolderActions.m | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 6dcaa6007..adb3e1d73 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -3195,6 +3195,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir [event setUid: uid]; object = [SOGoAppointmentObject objectWithName: uid inContainer: self]; + [object setIsNew: YES]; content = [NSString stringWithFormat: @"BEGIN:VCALENDAR\n%@\nEND:VCALENDAR", [event versitString]]; diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m index 27de79d4b..94a47e541 100644 --- a/UI/Contacts/UIxContactFolderActions.m +++ b/UI/Contacts/UIxContactFolderActions.m @@ -207,24 +207,24 @@ - (BOOL) importVcard: (NGVCard *) card { - NSString *uid, *name; + NSString *uid; SOGoContactGCSFolder *folder; - NSException *ex; + SOGoContactGCSEntry *contact; BOOL rc = NO; if (card) { folder = [self clientObject]; uid = [folder globallyUniqueObjectId]; - name = [NSString stringWithFormat: @"%@.vcf", uid]; + [card setUid: uid]; - ex = [[folder ocsFolder] writeContent: [card versitString] - toName: name - baseVersion: 0]; - if (ex) - NSLog (@"write failed: %@", ex); - else - rc = YES; + contact = [SOGoContactGCSEntry objectWithName: uid + inContainer: folder]; + [contact setIsNew: YES]; + + [contact saveContentString: [card versitString]]; + + rc = YES; } return rc; From f66e173e82c0b110ce5f770814c638945d2b2632 Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 28 Sep 2009 13:54:28 +0000 Subject: [PATCH 5/5] Mantis 153: NSInvalidArgumentException (missing lang classes) Monotone-Parent: 2494a7d12f52699f7ee338f8403ab926c0c118ab Monotone-Revision: 8889afbf143b1653a2ac96bad029b4301fc1f146 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-09-28T13:54:28 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/Appointments/SOGoAptMailDeletion.m | 6 ++++++ SoObjects/Appointments/SOGoAptMailICalReply.m | 6 ++++++ SoObjects/Appointments/SOGoAptMailInvitation.m | 6 ++++++ SoObjects/Appointments/SOGoAptMailUpdate.m | 8 ++++++++ 5 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index 905f41def..ee3e3a6af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-28 Cyril Robert + + * SoObjects/Appointments/SOGoAptMailInvitation.m: Added Spanish definition. + * SoObjects/Appointments/SOGoAptMailICalReply.m: Added Spanish definition. + * SoObjects/Appointments/SOGoAptMailDeletion.m: Added Spanish definition. + * SoObjects/Appointments/SOGoAptMailUpdate.m: Added Spanish definition. + 2009-09-28 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUser.m (+initialize): avoid a crash when diff --git a/SoObjects/Appointments/SOGoAptMailDeletion.m b/SoObjects/Appointments/SOGoAptMailDeletion.m index 970772ddc..ed0e5d277 100644 --- a/SoObjects/Appointments/SOGoAptMailDeletion.m +++ b/SoObjects/Appointments/SOGoAptMailDeletion.m @@ -69,3 +69,9 @@ @implementation SOGoAptMailRussianDeletion @end +@interface SOGoAptMailSpanishDeletion : SOGoAptMailNotification +@end + +@implementation SOGoAptMailSpanishDeletion +@end + diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index d0f9e82cb..022114482 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/SoObjects/Appointments/SOGoAptMailICalReply.m @@ -245,3 +245,9 @@ static NSCharacterSet *wsSet = nil; @implementation SOGoAptMailRussianICalReply @end +@interface SOGoAptMailSpanishICalReply : SOGoAptMailICalReply +@end + +@implementation SOGoAptMailSpanishICalReply +@end + diff --git a/SoObjects/Appointments/SOGoAptMailInvitation.m b/SoObjects/Appointments/SOGoAptMailInvitation.m index b56cf582b..32c1363c1 100644 --- a/SoObjects/Appointments/SOGoAptMailInvitation.m +++ b/SoObjects/Appointments/SOGoAptMailInvitation.m @@ -69,3 +69,9 @@ @implementation SOGoAptMailRussianInvitation @end +@interface SOGoAptMailSpanishInvitation : SOGoAptMailNotification +@end + +@implementation SOGoAptMailSpanishInvitation +@end + diff --git a/SoObjects/Appointments/SOGoAptMailUpdate.m b/SoObjects/Appointments/SOGoAptMailUpdate.m index e16d68541..6595d1af0 100644 --- a/SoObjects/Appointments/SOGoAptMailUpdate.m +++ b/SoObjects/Appointments/SOGoAptMailUpdate.m @@ -88,3 +88,11 @@ @implementation SOGoAptMailItalianUpdate @end +@interface SOGoAptMailSpanishUpdate : SOGoAptMailNotification +{ +} +@end + +@implementation SOGoAptMailSpanishUpdate +@end +