"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "WebUI/Mailer/OGoWebMail/LSWImapMails.m" between
opengroupware-5.5rc2.tar.gz and opengroupware-5.5rc3.tar.gz

About: OpenGroupware is a branch of the "traditional" OpenGroupware collaboration system (developed in Objective-C on SOPE). Release candidate.

LSWImapMails.m  (opengroupware-5.5rc2)	:	LSWImapMails.m  (opengroupware-5.5rc3)
skipping to change at line 384		skipping to change at line 384
}		}
}		}
}		}
#endif		#endif
}		}
if (obj) {		if (obj) {
if ([self->selectedFolder isEqual:obj] &&		if ([self->selectedFolder isEqual:obj] &&
![obj isEqual:[[self imapContext] trashFolder]]) {		![obj isEqual:[[self imapContext] trashFolder]]) {
[self->selectedFolder release]; self->selectedFolder = nil;		[self->selectedFolder release]; self->selectedFolder = nil;
self->selectedFolder = [[(NGImap4Folder *)obj parentFolder] retain];		self->selectedFolder = (NGImap4Folder *)[[(NGImap4Folder *)obj parentF older] retain];
[self->mailDataSource setFolder:self->selectedFolder];		[self->mailDataSource setFolder:self->selectedFolder];
[self->mailListState setName:[self mailListName]];		[self->mailListState setName:[self mailListName]];
[self->mailListState setFolder:self->selectedFolder];		[self->mailListState setFolder:self->selectedFolder];
[self->mailListState setCurrentBatch:1];		[self->mailListState setCurrentBatch:1];
[self _postMailsClearSelections];		[self _postMailsClearSelections];
}		}
[self->note removeObjectForKey:@"LSWImapMailFolderWasDeleted"];		[self->note removeObjectForKey:@"LSWImapMailFolderWasDeleted"];
}		}
skipping to change at line 714		skipping to change at line 714
[self _processUnknownException:_exception];		[self _processUnknownException:_exception];
}		}
- (id)reallyDeleteFolder {		- (id)reallyDeleteFolder {
NGImap4Folder *tmp;		NGImap4Folder *tmp;
[self->selectedFolder resetLastException];		[self->selectedFolder resetLastException];
tmp = self->selectedFolder;		tmp = self->selectedFolder;
self->selectedFolder = [[self->selectedFolder parentFolder] retain];		self->selectedFolder = (NGImap4Folder *)[[self->selectedFolder parentFolder] r etain];
if ([tmp isInTrash] || [self deleteFolderImmediately])		if ([tmp isInTrash] || [self deleteFolderImmediately])
[self->selectedFolder deleteSubFolder:tmp];		[self->selectedFolder deleteSubFolder:tmp];
else		else
[self->selectedFolder moveSubFolder:tmp to:[self trashFolder]];		[self->selectedFolder moveSubFolder:tmp to:[self trashFolder]];
[self->mailDataSource setFolder:self->selectedFolder];		[self->mailDataSource setFolder:self->selectedFolder];
[self->mailListState setCurrentBatch:1];		[self->mailListState setCurrentBatch:1];
[self->mailListState setFolder:self->selectedFolder];		[self->mailListState setFolder:self->selectedFolder];
[self setIsInWarningMode:NO];		[self setIsInWarningMode:NO];
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---