mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-08 04:55:26 +00:00
Monotone-Parent: 10b56ee326ca77f71fbe5cb41d30b0640a6fe57a
Monotone-Revision: 494c37e329faf06b93265c155db7226d205150b0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-13T21:20:57 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#include <SOGo/AgenorUserManager.h>
|
||||
#include <GDLContentStore/GCSFolder.h>
|
||||
#include <SaxObjC/SaxObjC.h>
|
||||
#include <NGiCal/NGiCal.h>
|
||||
#include <NGCards/NGCards.h>
|
||||
#include <NGExtensions/NGCalendarDateRange.h>
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <SOGo/AgenorUserManager.h>
|
||||
#include <SOGo/SOGoAppointment.h>
|
||||
#include <SaxObjC/SaxObjC.h>
|
||||
#include <NGiCal/NGiCal.h>
|
||||
#include <NGCards/NGCards.h>
|
||||
#include <NGMime/NGMime.h>
|
||||
#include <NGMail/NGMail.h>
|
||||
#include <NGMail/NGSendMail.h>
|
||||
@@ -78,7 +78,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
|
||||
retain];
|
||||
if (parser == nil)
|
||||
[logger fatalWithFormat:@"did not find a parser for text/calendar!"];
|
||||
sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
|
||||
sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
|
||||
if (sax == nil)
|
||||
[logger fatalWithFormat:@"could not create the iCal SAX handler!"];
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
#include "SOGoFreeBusyObject.h"
|
||||
#include "common.h"
|
||||
#include <SOGo/AgenorUserManager.h>
|
||||
#include <NGiCal/NGiCal.h>
|
||||
#include <NGiCal/iCalRenderer.h>
|
||||
#include <NGCards/NGCards.h>
|
||||
#include <NGCards/iCalRenderer.h>
|
||||
|
||||
@interface NSDate(UsedPrivates)
|
||||
- (NSString *)icalString; // declared in NGiCal
|
||||
- (NSString *)icalString; // declared in NGCards
|
||||
@end
|
||||
|
||||
@interface SOGoFreeBusyObject (PrivateAPI)
|
||||
|
||||
@@ -17,8 +17,6 @@ Contacts_OBJC_FILES = \
|
||||
\
|
||||
NSDictionary+Contact.m \
|
||||
NGLdapEntry+Contact.m \
|
||||
NGVCard+Contact.m \
|
||||
NGVCardSimpleValue+Contact.m \
|
||||
|
||||
Contacts_RESOURCE_FILES += \
|
||||
Version \
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "SOGoAppointment.h"
|
||||
#include <SaxObjC/SaxObjC.h>
|
||||
#include <NGiCal/NGiCal.h>
|
||||
#include <NGCards/NGCards.h>
|
||||
#include <EOControl/EOControl.h>
|
||||
#include "SOGoAppointmentICalRenderer.h"
|
||||
#include "common.h"
|
||||
@@ -52,7 +52,7 @@ static NGLogger *logger = nil;
|
||||
retain];
|
||||
if (parser == nil)
|
||||
[logger fatalWithFormat:@"did not find a parser for text/calendar!"];
|
||||
sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
|
||||
sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
|
||||
if (sax == nil)
|
||||
[logger fatalWithFormat:@"could not create the iCal SAX handler!"];
|
||||
|
||||
@@ -422,8 +422,8 @@ static NGLogger *logger = nil;
|
||||
|
||||
|
||||
/*
|
||||
NOTE: this is not the same API as used by NGiCal!
|
||||
SOGo/OGo cannot deal with the complete NGiCal API properly, although
|
||||
NOTE: this is not the same API as used by NGCards!
|
||||
SOGo/OGo cannot deal with the complete NGCards API properly, although
|
||||
SOGo COULD do so in the future
|
||||
*/
|
||||
- (void)setRecurrenceRule:(iCalRecurrenceRule *)_rrule {
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
#include "SOGoAppointmentICalRenderer.h"
|
||||
#include "SOGoAppointment.h"
|
||||
#include <NGiCal/NGiCal.h>
|
||||
#include <NGiCal/iCalRenderer.h>
|
||||
#include <NGCards/NGCards.h>
|
||||
#include <NGCards/iCalRenderer.h>
|
||||
#include "common.h"
|
||||
|
||||
// TODO: the basic renderer should be part of NGiCal
|
||||
// TODO: the basic renderer should be part of NGCards
|
||||
|
||||
@interface NSDate(UsedPrivates)
|
||||
- (NSString *)icalString; // declared in NGiCal
|
||||
- (NSString *)icalString; // declared in NGCards
|
||||
@end
|
||||
|
||||
@implementation SOGoAppointmentICalRenderer
|
||||
|
||||
@@ -25,7 +25,7 @@ BUNDLE_LIBS += \
|
||||
-lGDLContentStore \
|
||||
-lGDLAccess \
|
||||
-lNGObjWeb \
|
||||
-lNGiCal -lNGMime -lNGLdap \
|
||||
-lNGCards -lNGMime -lNGLdap \
|
||||
-lNGStreams -lNGExtensions -lEOControl \
|
||||
-lXmlRpc -lDOM -lSaxObjC
|
||||
|
||||
|
||||
Reference in New Issue
Block a user