merge of '5052783f79bc86c62042f5d4a556a3573c4a3876'
and '8889afbf143b1653a2ac96bad029b4301fc1f146' Monotone-Parent: 5052783f79bc86c62042f5d4a556a3573c4a3876 Monotone-Parent: 8889afbf143b1653a2ac96bad029b4301fc1f146 Monotone-Revision: fcece651323f876baef1d1d08bc52772b67ce6a4 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-09-28T15:07:20 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
commit
9ae151dfb9
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2009-09-28 Cyril Robert <crobert@inverse.ca>
|
||||
|
||||
* 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 <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoUser.m (+initialize): avoid a crash when
|
||||
SOGoProfileURL is not set.
|
||||
|
||||
2009-09-27 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* Reworked the UIxMailPartSignedViewer to inherit
|
||||
|
|
|
|||
|
|
@ -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]];
|
||||
|
|
|
|||
|
|
@ -69,3 +69,9 @@
|
|||
@implementation SOGoAptMailRussianDeletion
|
||||
@end
|
||||
|
||||
@interface SOGoAptMailSpanishDeletion : SOGoAptMailNotification
|
||||
@end
|
||||
|
||||
@implementation SOGoAptMailSpanishDeletion
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -245,3 +245,9 @@ static NSCharacterSet *wsSet = nil;
|
|||
@implementation SOGoAptMailRussianICalReply
|
||||
@end
|
||||
|
||||
@interface SOGoAptMailSpanishICalReply : SOGoAptMailICalReply
|
||||
@end
|
||||
|
||||
@implementation SOGoAptMailSpanishICalReply
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -69,3 +69,9 @@
|
|||
@implementation SOGoAptMailRussianInvitation
|
||||
@end
|
||||
|
||||
@interface SOGoAptMailSpanishInvitation : SOGoAptMailNotification
|
||||
@end
|
||||
|
||||
@implementation SOGoAptMailSpanishInvitation
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -88,3 +88,11 @@
|
|||
@implementation SOGoAptMailItalianUpdate
|
||||
@end
|
||||
|
||||
@interface SOGoAptMailSpanishUpdate : SOGoAptMailNotification
|
||||
{
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation SOGoAptMailSpanishUpdate
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
<?xml version="1.0" standalone="yes"?>
|
||||
<!DOCTYPE div>
|
||||
<div xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:var="http://www.skyrix.com/od/binding"
|
||||
xmlns:const="http://www.skyrix.com/od/constant"
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:label="OGo:label"
|
||||
>
|
||||
<div>
|
||||
<var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
|
||||
<div>
|
||||
<var:component value="contentViewerComponent"
|
||||
bodyInfo="childInfo"
|
||||
partPath="childPartPath" />
|
||||
</div>
|
||||
</var:foreach>
|
||||
</div>
|
||||
xmlns:var="http://www.skyrix.com/od/binding"
|
||||
xmlns:const="http://www.skyrix.com/od/constant"
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:label="OGo:label"
|
||||
>
|
||||
<var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
|
||||
<div>
|
||||
<var:component value="contentViewerComponent"
|
||||
bodyInfo="childInfo"
|
||||
partPath="childPartPath" />
|
||||
</div>
|
||||
</var:foreach>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
>
|
||||
<div>
|
||||
<var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
|
||||
<div>
|
||||
<var:component value="contentViewerComponent"
|
||||
bodyInfo="childInfo"
|
||||
partPath="childPartPath" />
|
||||
</div>
|
||||
</var:foreach>
|
||||
</div>
|
||||
var:error="validationMessage">
|
||||
<var:foreach list="bodyInfo.parts" item="childInfo" index="childIndex">
|
||||
<div>
|
||||
<var:component value="contentViewerComponent"
|
||||
bodyInfo="childInfo"
|
||||
partPath="childPartPath" />
|
||||
</div>
|
||||
</var:foreach>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue