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

Monotone-Parent: 09b0d503bdecee3c305021b5aa23a3b7372aefb0

Browse source 
Monotone-Revision: 7023cb55bf9c1104e85e96a623772bbc7ded0d5b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-12-30T14:53:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-12-30 14:53:11 +00:00
parent e3924e0f09
commit 3099c59692
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,5 +1,13 @@
2010-12-30 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-12-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/SOGoTaskObject+MAPIStore.m
(-setMAPIProperties:): same as below.
* OpenChange/SOGoAppointmentObject+MAPIStore.m
(-setMAPIProperties:): make use of proper named properties macro
symbols rather than their values, now that they are handled better
in the openchange core.
* OpenChange/SOGoMAPIFSFolder.m (-initWithURL:andTableType:): * OpenChange/SOGoMAPIFSFolder.m (-initWithURL:andTableType:):
accepts a new "tableType" parameter to store messages in a accepts a new "tableType" parameter to store messages in a
different place of the fs folder hierarchy. different place of the fs folder hierarchy.

8
OpenChange/SOGoAppointmentObject+MAPIStore.m
View file

@ -22,6 +22,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <gen_ndr/exchange.h> #include <gen_ndr/exchange.h>
#include <mapistore/mapistore_nameid.h>
#import <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
#import <Foundation/NSTimeZone.h> #import <Foundation/NSTimeZone.h>
@ -41,6 +42,7 @@
#import "SOGoAppointmentObject+MAPIStore.h" #import "SOGoAppointmentObject+MAPIStore.h"
@implementation SOGoAppointmentObject (MAPIStoreMessage) @implementation SOGoAppointmentObject (MAPIStoreMessage)
/* TODO: merge with tasks */ /* TODO: merge with tasks */
@ -102,7 +104,7 @@
[vEvent setSummary: value]; [vEvent setSummary: value];
// Location // Location
value = [properties objectForKey: MAPIPropertyKey (0x810c001f)]; value = [properties objectForKey: MAPIPropertyKey (PidLidLocation)];
if (value) if (value)
[vEvent setLocation: value]; [vEvent setLocation: value];
@ -112,6 +114,8 @@
// start // start
value = [properties objectForKey: MAPIPropertyKey (PR_START_DATE)]; value = [properties objectForKey: MAPIPropertyKey (PR_START_DATE)];
if (!value)
value = [properties objectForKey: MAPIPropertyKey (PidLidAppointmentStartWhole)];
if (value) if (value)
{ {
start = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtstart"]; start = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtstart"];
@ -121,6 +125,8 @@
// end // end
value = [properties objectForKey: MAPIPropertyKey (PR_END_DATE)]; value = [properties objectForKey: MAPIPropertyKey (PR_END_DATE)];
if (!value)
value = [properties objectForKey: MAPIPropertyKey (PidLidAppointmentEndWhole)];
if (value) if (value)
{ {
end = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtend"]; end = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtend"];

9
OpenChange/SOGoTaskObject+MAPIStore.m
View file

@ -22,6 +22,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <gen_ndr/exchange.h> #include <gen_ndr/exchange.h>
#include <mapistore/mapistore_nameid.h>
#import <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
#import <Foundation/NSTimeZone.h> #import <Foundation/NSTimeZone.h>
@ -126,7 +127,7 @@
[vToDo setComment: value]; [vToDo setComment: value];
// Location // Location
value = [properties objectForKey: MAPIPropertyKey (0x810c001f)]; value = [properties objectForKey: MAPIPropertyKey (PidLidLocation)];
if (value) if (value)
[vToDo setLocation: value]; [vToDo setLocation: value];
@ -148,7 +149,7 @@
[vCalendar addTimeZone: tz]; [vCalendar addTimeZone: tz];
// start // start
value = [properties objectForKey: MAPIPropertyKey (0x811e0040)]; value = [properties objectForKey: MAPIPropertyKey (PidLidTaskStartDate)];
if (value) if (value)
{ {
date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"dtstart"]; date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"dtstart"];
@ -157,7 +158,7 @@
} }
// due // due
value = [properties objectForKey: MAPIPropertyKey (0x811f0040)]; value = [properties objectForKey: MAPIPropertyKey (PidLidTaskDueDate)];
if (value) if (value)
{ {
date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"due"]; date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"due"];
@ -166,7 +167,7 @@
} }
// status // status
value = [properties objectForKey: MAPIPropertyKey (0x81200003)]; value = [properties objectForKey: MAPIPropertyKey (PidLidTaskStatus)];
if (value) if (value)
{ {
switch ([value intValue]) switch ([value intValue])