amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-23 22:09:29 +00:00
Code Issues Projects Releases Wiki Activity

merge of '7624d5a942129f2c8c6c2c4fd80d29b937bf470d'

Browse Source 
and '8c19f19f3be5a4b6fb34ceeaab91ee58b54610d1'

Monotone-Parent: 7624d5a942129f2c8c6c2c4fd80d29b937bf470d
Monotone-Parent: 8c19f19f3be5a4b6fb34ceeaab91ee58b54610d1
Monotone-Revision: 07c1acd90de17a7e8f0064aff341a4244b2f090b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-12T04:21:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-07-12 04:21:22 +00:00
parent a2f242aab0 b6bd0c4497
commit 7a3300829f
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SOPE/NGCards/ChangeLog
View File

@@ -1,5 +1,9 @@
2011-07-11 Francis Lachapelle <flachapelle@inverse.ca>
* iCalDailyRecurrenceCalculator.m
(-recurrenceRangesWithinCalendarDateRange:): we must return all
ranges that intersect with the lookup period.
* iCalRepeatableEntityObject.m (-addToExceptionDates:): drop the
time part when dealing with an all-day event.

6
SOPE/NGCards/iCalDailyRecurrenceCalculator.m
View File

@@ -160,9 +160,8 @@
{
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate
endDate: currentEndDate];
if ([_r containsDateRange: r])
endDate: currentEndDate];
if ([_r containsDateRange: r] || [_r doesIntersectWithDateRange: r])
[ranges addObject: r];
}
}
@@ -178,6 +177,7 @@
i++;
}
return ranges;
}

6
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -981,9 +981,6 @@ static NSString *userAgent = nil;
*/
NGMutableHashMap *map;
NGMimeBodyPart *bodyPart;
SOGoUserDefaults *ud;
ud = [[context activeUser] userDefaults];
/* prepare header of body part */
@@ -1014,12 +1011,9 @@ static NSString *userAgent = nil;
- (NGMimeMessage *) mimeMessageForContentWithHeaderMap: (NGMutableHashMap *) map
{
NGMimeMessage *message;
SOGoUserDefaults *ud;
// BOOL addSuffix;
id body;
ud = [[context activeUser] userDefaults];
[map setObject: @"text/plain" forKey: @"content-type"];
body = text;
if (body)

3
SoObjects/Mailer/SOGoDraftsFolder.m
View File

@@ -37,7 +37,7 @@ static unsigned int newCount;
- (NSString *) generateNameForNewDraft
{
NSString *newName, *login;
NSString *newName;
unsigned int currentTime;
currentTime = [[NSDate date] timeIntervalSince1970];
@@ -49,7 +49,6 @@ static unsigned int newCount;
newCount = 1;
}
login = [[context activeUser] login];
newName = [NSString stringWithFormat: @"newDraft%u-%u",
currentTime, newCount];

14
SoObjects/Mailer/SOGoMailAccount.m
View File

@@ -121,13 +121,6 @@ static NSString *inboxFolderName = @"INBOX";
NSArray *namespace;
NGImap4Client *client;
SOGoUser *user;
NSArray *accounts;
NSDictionary *account;
user = [SOGoUser userWithLogin: [self ownerInContext: nil]];
accounts = [user mailAccounts];
account = [accounts objectAtIndex: [nameInContainer intValue]];
client = [[self imap4Connection] client];
namespaceDict = [client namespace];
@@ -285,10 +278,9 @@ static NSString *inboxFolderName = @"INBOX";
manager = [SOGoSieveManager sieveManagerForUser: [context activeUser]];
return [manager updateFiltersForLogin: [[self imap4URL] user]
authname: [[self imap4URL] user]
password: [self imap4PasswordRenewed: NO]
account: self];
authname: [[self imap4URL] user]
password: [self imap4PasswordRenewed: NO]
account: self];
}