nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't double xlist; fix #6686

Browse source
This commit is contained in:
Charles Lindsay 2013-04-03 13:11:11 -07:00
parent d765fd1cc9
commit 8180c5a6de
2 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client/folder-list/folder-list-account-branch.vala
View file

@ -20,7 +20,8 @@ public class FolderList.AccountBranch : Sidebar.Branch {
new ThemedIcon("folder-open"), new ThemedIcon("folder"));
user_folder_group = new SpecialGrouping(2, "",
IconFactory.instance.get_custom_icon("tags", IconFactory.ICON_SIDEBAR));
folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>();
folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>(
Geary.Hashable.hash_func, Geary.Equalable.equal_func);
account.information.notify["nickname"].connect(on_nicknamed_changed);

20
src/engine/imap-engine/imap-engine-generic-account.vala
View file

@ -52,26 +52,6 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.AbstractAccount {
throw new EngineError.OPEN_REQUIRED("Account %s not opened", to_string());
}
protected override void notify_folders_available_unavailable(Gee.Collection<Geary.Folder>? available,
Gee.Collection<Geary.Folder>? unavailable) {
base.notify_folders_available_unavailable(available, unavailable);
if (available != null) {
foreach(Folder f in available) {
if (f.get_properties().has_children.is_possible())
enumerate_folders_async.begin(f.get_path(), null, on_enumerate_folders_async_complete);
}
}
}
private void on_enumerate_folders_async_complete(Object? object, AsyncResult result) {
try {
enumerate_folders_async.end(result);
} catch (Error e) {
debug("Error enumerating subfolders: %s", e.message);
}
}
public override async void open_async(Cancellable? cancellable = null) throws Error {
if (open)
throw new EngineError.ALREADY_OPEN("Account %s already opened", to_string());