merge of '5475eac0e45624fa60269bb388e23e6e2dc89bd8'

and '6c665d10d66699c41ab79b02a4b7703765bc6d2a'

Monotone-Parent: 5475eac0e45624fa60269bb388e23e6e2dc89bd8
Monotone-Parent: 6c665d10d66699c41ab79b02a4b7703765bc6d2a
Monotone-Revision: 0c1ec7e54de5221c8ed291d64541b4524fc8ca6d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-24T14:24:01
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-12-24 14:24:01 +00:00
commit 84c7e145ab
3 changed files with 8 additions and 28 deletions

View File

@ -1,3 +1,9 @@
2009-12-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailAccount.m (-isSharedAccount): removed
useless method.
(-sharedAccountName): removed useless method.
2009-12-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Scheduler/UIxCalView.m
@ -29,13 +35,13 @@
* Removed all references to "anais" stuff.
* SoObjects/Mailer/SOGoMailFoder.m (-deleteUIDs:inContext:):
* SoObjects/Mailer/SOGoMailFolder.m (-deleteUIDs:inContext:):
we check if we aren't in the Trash folder already before try to
copy over deleted messages.
* We now offer a way to delete events from the context menu
in all calendar views.
2009-12-22 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxAppointmentEditor.m (-viewAction): added

View File

@ -70,11 +70,6 @@ typedef enum {
- (NSArray *) allFolderPaths;
- (BOOL) isInDraftsFolder;
/* shared accounts */
- (BOOL) isSharedAccount;
- (NSString *) sharedAccountName;
/* special folders */
- (NSString *) inboxFolderNameInContext: (id)_ctx;

View File

@ -87,27 +87,6 @@ static NSString *sieveScriptName = @"sogo";
ASSIGN (accountName, newAccountName);
}
/* shared accounts */
- (BOOL) isSharedAccount
{
NSString *s;
NSRange r;
s = accountName;
r = [s rangeOfString:@"@"];
if (r.length == 0) /* regular HTTP logins are never a shared mailbox */
return NO;
s = [s substringToIndex:r.location];
return [s rangeOfString:@".-."].length > 0 ? YES : NO;
}
- (NSString *) sharedAccountName
{
return nil;
}
/* listing the available folders */
- (BOOL) isInDraftsFolder