amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-11 03:15:10 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo' (head ccc94ebd9d872963c33041a7cac766343762bef2)

Browse Source 
to branch 'ca.inverse.sogo.1_3_17' (head 987a622d6acb514d5652a1125c4c320d585470ae)

Monotone-Parent: 987a622d6acb514d5652a1125c4c320d585470ae
Monotone-Parent: ccc94ebd9d872963c33041a7cac766343762bef2
Monotone-Revision: 74828d7539e15e54c9b42034f03693356bb13912

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-08T21:33:45
This commit is contained in:
Francis Lachapelle
2012-06-08 21:33:45 +00:00
parent 781c578fa2 b4d8609236
commit ac46cef9b0
18 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -19,6 +19,8 @@
2012-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/*: fixed build errors with gcc-4.7
* UI/MailPartViewers/UIxMailPartAlternativeViewer.m
(-childPartName): fixed a potential crash by building the NSString
from the integer itself, with the proper format string.
OpenChange/MAPIStoreAppointmentWrapper.m
+1
View File
@@ -35,6 +35,7 @@
#import <NGCards/iCalTimeZone.h>
#import <NGCards/iCalTrigger.h>
#import <NGCards/NSString+NGCards.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserManager.h>
#import "MAPIStoreRecurrenceUtils.h"
OpenChange/MAPIStoreAttachment.h
+4 -4
View File
@@ -26,7 +26,7 @@
#import "MAPIStoreObject.h"
@class NSData;
@class MAPIStoreAttachmentMessage;
@class MAPIStoreEmbeddedMessage;
@interface MAPIStoreAttachment : MAPIStoreObject
{
@@ -36,7 +36,7 @@
- (void) setAID: (uint32_t) newAID;
- (uint32_t) AID;
- (int) openEmbeddedMessage: (MAPIStoreAttachmentMessage **) messagePtr
- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
withMID: (uint64_t *) mid
withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
inMemCtx: (TALLOC_CTX *) memCtx;
@@ -45,8 +45,8 @@
- (NSData *) mimeAttachTag;
/* subclasses */
- (MAPIStoreAttachmentMessage *) openEmbeddedMessage;
- (MAPIStoreAttachmentMessage *) createEmbeddedMessage;
- (MAPIStoreEmbeddedMessage *) openEmbeddedMessage;
- (MAPIStoreEmbeddedMessage *) createEmbeddedMessage;
@end
OpenChange/MAPIStoreAttachment.m
+5 -4
View File
@@ -23,6 +23,7 @@
#import <Foundation/NSData.h>
#import "MAPIStoreAttachment.h"
#import "MAPIStoreEmbeddedMessage.h"
#import "MAPIStoreContext.h"
#import "MAPIStoreMapping.h"
#import "MAPIStoreMessage.h"
@@ -89,12 +90,12 @@
return MAPISTORE_SUCCESS;
}
- (int) openEmbeddedMessage: (MAPIStoreAttachmentMessage **) messagePtr
- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
withMID: (uint64_t *) mid
withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
inMemCtx: (TALLOC_CTX *) memCtx
{
MAPIStoreAttachmentMessage *attMessage;
MAPIStoreEmbeddedMessage *attMessage;
MAPIStoreMapping *mapping;
struct mapistore_message *mapistoreMsg;
@@ -137,14 +138,14 @@
}
/* subclasses */
- (MAPIStoreAttachmentMessage *) openEmbeddedMessage
- (MAPIStoreEmbeddedMessage *) openEmbeddedMessage
{
// [self subclassResponsibility: _cmd];
return nil;
}
- (MAPIStoreAttachmentMessage *) createEmbeddedMessage
- (MAPIStoreEmbeddedMessage *) createEmbeddedMessage
{
[self subclassResponsibility: _cmd];
OpenChange/MAPIStoreEmbeddedMessage.m
+2
View File
@@ -22,6 +22,8 @@
#import <Foundation/NSString.h>
#import "MAPIStoreAttachment.h"
#import "MAPIStoreEmbeddedMessage.h"
static Class MAPIStoreAttachmentK;
OpenChange/MAPIStoreFAIMessage.m
+2
View File
@@ -20,6 +20,8 @@
* Boston, MA 02111-1307, USA.
*/
#import <SOGo/SOGoUser.h>
#import "MAPIStoreActiveTables.h"
#import "MAPIStoreContext.h"
#import "MAPIStoreUserContext.h"
OpenChange/MAPIStoreFSFolder.m
+1
View File
@@ -23,6 +23,7 @@
#include <inttypes.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSString.h>
#import <Foundation/NSURL.h>
#import <NGExtensions/NSObject+Logs.h>
OpenChange/MAPIStoreFSMessage.m
+1
View File
@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSValue.h>
#import <NGExtensions/NSObject+Logs.h>
OpenChange/MAPIStoreFolder.m
+1
View File
@@ -30,6 +30,7 @@
#import <Foundation/NSURL.h>
#import <NGExtensions/NSObject+Logs.h>
#import <SOGo/SOGoContentObject.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoFolder.h>
#import "MAPIStoreActiveTables.h"
OpenChange/MAPIStoreGCSMessage.m
+1
View File
@@ -27,6 +27,7 @@
#import <NGExtensions/NSObject+Logs.h>
#import <SOGo/SOGoContentObject.h>
#import <SOGo/SOGoPermissions.h>
#import <SOGo/SOGoUser.h>
#import "MAPIStoreContext.h"
#import "MAPIStoreGCSFolder.h"
OpenChange/MAPIStoreGCSMessageTable.m
+1
View File
@@ -21,6 +21,7 @@
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h>
#import <Foundation/NSString.h>
OpenChange/MAPIStoreMailMessage.m
+1
View File
@@ -50,6 +50,7 @@
#import "MAPIStoreMapping.h"
#import "MAPIStoreSamDBUtils.h"
#import "MAPIStoreTypes.h"
#import "MAPIStoreUserContext.h"
#import "MAPIStoreMailMessage.h"
OpenChange/MAPIStoreObject.m
+1
View File
@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSTimeZone.h>
OpenChange/MAPIStorePermissionsTable.m
+1
View File
@@ -24,6 +24,7 @@
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <SOGo/SOGoFolder.h>
#import <SOGo/SOGoObject.h>
#import <SOGo/SOGoUser.h>
OpenChange/MAPIStoreSOGo.m
+3 -1
View File
@@ -36,7 +36,9 @@
#import "MAPIApplication.h"
#import "MAPIStoreAttachment.h"
#import "MAPIStoreAttachmentTable.h"
#import "MAPIStoreContext.h"
#import "MAPIStoreEmbeddedMessage.h"
#import "MAPIStoreFolder.h"
#import "MAPIStoreMessage.h"
#import "MAPIStoreMailVolatileMessage.h"
@@ -969,7 +971,7 @@ sogo_message_attachment_open_embedded_message
struct MAPIStoreTallocWrapper *wrapper;
NSAutoreleasePool *pool;
MAPIStoreAttachment *attachment;
MAPIStoreAttachmentMessage *message;
MAPIStoreEmbeddedMessage *message;
int rc;
DEBUG (5, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__));
OpenChange/MAPIStoreTasksMessage.m
+1
View File
@@ -43,6 +43,7 @@
#import "MAPIStoreContext.h"
#import "MAPIStoreTasksFolder.h"
#import "MAPIStoreTypes.h"
#import "MAPIStoreUserContext.h"
#import "NSDate+MAPIStore.h"
#import "NSObject+MAPIStore.h"
#import "NSString+MAPIStore.h"
OpenChange/MAPIStoreTypes.m
+1
View File
@@ -21,6 +21,7 @@
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h>
#import <Foundation/NSNull.h>
OpenChange/NSObject+MAPIStore.m
+1
View File
@@ -21,6 +21,7 @@
*/
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSCalendarDate.h>
#import <Foundation/NSThread.h>
#import <NGExtensions/NSObject+Logs.h>