Monotone-Parent: b526d981477874b339fcb0e64ee456714c76b84f
Monotone-Revision: 290944a7a48619d2848c467ceac22359889e773c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-07-19T21:49:37 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
823fa2b9a8
commit
dbc50c78aa
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
* OpenChange/MAPIStoreCalendarMessage.m: reordered certain private
|
* OpenChange/MAPIStoreCalendarMessage.m: reordered certain private
|
||||||
methods.
|
methods.
|
||||||
|
(-ownerTimeZone): moved into MAPIStoreObject.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreMailMessage.m (-_setupBodyData): new
|
* OpenChange/MAPIStoreMailMessage.m (-_setupBodyData): new
|
||||||
centralized method that performs the common operations required to
|
centralized method that performs the common operations required to
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#import <NGCards/iCalTimeZone.h>
|
#import <NGCards/iCalTimeZone.h>
|
||||||
#import <NGCards/iCalPerson.h>
|
#import <NGCards/iCalPerson.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
#import <SOGo/SOGoUserDefaults.h>
|
|
||||||
#import <Appointments/SOGoAppointmentObject.h>
|
#import <Appointments/SOGoAppointmentObject.h>
|
||||||
|
|
||||||
#import "MAPIStoreCalendarAttachment.h"
|
#import "MAPIStoreCalendarAttachment.h"
|
||||||
|
@ -84,21 +83,6 @@ static NSTimeZone *utcTZ;
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSTimeZone *) ownerTimeZone
|
|
||||||
{
|
|
||||||
NSString *owner;
|
|
||||||
SOGoUserDefaults *ud;
|
|
||||||
NSTimeZone *tz;
|
|
||||||
WOContext *woContext;
|
|
||||||
|
|
||||||
woContext = [[self context] woContext];
|
|
||||||
owner = [sogoObject ownerInContext: woContext];
|
|
||||||
ud = [[SOGoUser userWithLogin: owner] userDefaults];
|
|
||||||
tz = [ud timeZone];
|
|
||||||
|
|
||||||
return tz;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* getters */
|
/* getters */
|
||||||
- (int) getPrIconIndex: (void **) data // TODO
|
- (int) getPrIconIndex: (void **) data // TODO
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
|
|
|
@ -77,6 +77,8 @@
|
||||||
- (uint64_t) objectId;
|
- (uint64_t) objectId;
|
||||||
- (NSString *) url;
|
- (NSString *) url;
|
||||||
|
|
||||||
|
- (NSTimeZone *) ownerTimeZone;
|
||||||
|
|
||||||
/* properties */
|
/* properties */
|
||||||
|
|
||||||
- (void) addNewProperties: (NSDictionary *) newNewProperties;
|
- (void) addNewProperties: (NSDictionary *) newNewProperties;
|
||||||
|
|
|
@ -23,6 +23,8 @@
|
||||||
#import <Foundation/NSDictionary.h>
|
#import <Foundation/NSDictionary.h>
|
||||||
#import <NGExtensions/NSObject+Logs.h>
|
#import <NGExtensions/NSObject+Logs.h>
|
||||||
#import <SOGo/SOGoObject.h>
|
#import <SOGo/SOGoObject.h>
|
||||||
|
#import <SOGo/SOGoUser.h>
|
||||||
|
#import <SOGo/SOGoUserDefaults.h>
|
||||||
|
|
||||||
#import "MAPIStoreContext.h"
|
#import "MAPIStoreContext.h"
|
||||||
#import "MAPIStoreFolder.h"
|
#import "MAPIStoreFolder.h"
|
||||||
|
@ -207,6 +209,21 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
||||||
containerURL, [self nameInContainer]];
|
containerURL, [self nameInContainer]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSTimeZone *) ownerTimeZone
|
||||||
|
{
|
||||||
|
NSString *owner;
|
||||||
|
SOGoUserDefaults *ud;
|
||||||
|
NSTimeZone *tz;
|
||||||
|
WOContext *woContext;
|
||||||
|
|
||||||
|
woContext = [[self context] woContext];
|
||||||
|
owner = [sogoObject ownerInContext: woContext];
|
||||||
|
ud = [[SOGoUser userWithLogin: owner] userDefaults];
|
||||||
|
tz = [ud timeZone];
|
||||||
|
|
||||||
|
return tz;
|
||||||
|
}
|
||||||
|
|
||||||
- (void) addNewProperties: (NSDictionary *) newNewProperties
|
- (void) addNewProperties: (NSDictionary *) newNewProperties
|
||||||
{
|
{
|
||||||
[newProperties addEntriesFromDictionary: newNewProperties];
|
[newProperties addEntriesFromDictionary: newNewProperties];
|
||||||
|
|
Loading…
Reference in a new issue