LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 135e7483e9580e1a8e72447e05a5d342c957b54a 

Monotone-Revision: 337924e6726c6500e1c6fb527d7aa68336314c02

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-09T15:59:56
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-07-09 15:59:56 +00:00
parent 726a54d7dc
commit 8cebb1931d
1 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
SOPE/sope-patchset-r1623.diff
View File

@ -1741,6 +1741,21 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
#import <EOControl/EOGlobalID.h>
#import <Foundation/NSString.h>
Index: sope-core/NGStreams/GNUmakefile.preamble
===================================================================
--- sope-core/NGStreams/GNUmakefile.preamble (révision 1623)
+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail)
@@ -1,7 +1,10 @@
# compilation settings
+MACHCPU = $(shell echo $$MACHTYPE | cut -f 1 -d '-')
+
libNGStreams_INCLUDE_DIRS += \
-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
+ -I./$(MACHCPU)/$(GNUSTEP_TARGET_OS) \
-INGStreams \
-I../NGExtensions \
-I..
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1623)
@ -1990,7 +2005,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
"{DAV:}locktoken" = davLockToken;
"{DAV:}activelock" = davActiveLock;
// TODO: non-standard?, also used by WebDrive
@@ -120,12 +126,29 @@
@@ -120,12 +126,31 @@
"{http://ucb.openoffice.org/dav/props/}IsRemoveable" = isOOoRemoveable;
"{http://ucb.openoffice.org/dav/props/}IsVolume" = isOOoVolume;
"{http://ucb.openoffice.org/dav/props/}TargetURL" = davOOoTargetURL;
@ -2016,12 +2031,14 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
"{urn:ietf:params:xml:ns:caldav}calendar-home-set" = davCalendarHomeSet;
+ "{urn:ietf:params:xml:ns:caldav}calendar-user-address-set" =
+ davCalendarUserAddressSet;
+ "{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set" =
+ davCalendarFreeBusySet;
+ "{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL" = davCalendarScheduleInboxURL;
+ "{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL" = davCalendarScheduleOutboxURL;
"{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set" =
davCalendarComponentSet;
"{urn:ietf:params:xml:ns:caldav}supported-calendar-data" =
@@ -138,13 +161,13 @@
@@ -138,13 +163,13 @@
"{urn:ietf:params:xml:ns:carddav}addressbook-description" = davDescription;
/* Apple CalServer */
@ -2317,3 +2334,33 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
@end /* WOHttpAdaptor */
@implementation WOCoreApplication(SimpleParserSelection)
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1623)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail)
@@ -62,6 +62,10 @@
/* RFC 3253 (DeltaV) */
NGHttpMethod_REPORT,
NGHttpMethod_VERSION_CONTROL,
+ /* RFC 4791 (CalDAV) */
+ NGHttpMethod_MKCALENDAR,
+ /* http://ietfreport.isoc.org/idref/draft-daboo-carddav/ (CardDAV) */
+ NGHttpMethod_MKADDRESSBOOK,
NGHttpMethod_last
} NGHttpMethod;
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m
===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1623)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail)
@@ -59,6 +59,10 @@
/* RFC 3253 (DeltaV) */
@"REPORT",
@"VERSION-CONTROL",
+ /* RFC 4791 (CalDAV) */
+ @"MKCALENDAR",
+ /* http://ietfreport.isoc.org/idref/draft-daboo-carddav/ (CardDAV) */
+ @"MKADDRESSBOOK",
nil
};