[geary/wip/create-folders-713492] Fix errors
- From: Charles Lindsay <clindsay src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/create-folders-713492] Fix errors
- Date: Wed, 5 Feb 2014 02:13:04 +0000 (UTC)
commit 7c98b1bbb231d3cf32c88072dfa1d67de3b5437d
Author: Charles Lindsay <chaz yorba org>
Date: Mon Feb 3 12:30:27 2014 -0800
Fix errors
.../imap-engine/imap-engine-generic-account.vala | 8 ++++----
src/engine/util/util-iterable.vala | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-generic-account.vala
b/src/engine/imap-engine/imap-engine-generic-account.vala
index 1a34e8a..92dcc5f 100644
--- a/src/engine/imap-engine/imap-engine-generic-account.vala
+++ b/src/engine/imap-engine/imap-engine-generic-account.vala
@@ -456,8 +456,8 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.AbstractAccount {
Gee.HashMap<Geary.SpecialFolderType, Gee.ArrayList<string>> compiled
= new Gee.HashMap<Geary.SpecialFolderType, Gee.ArrayList<string>>();
- foreach (Gee.Map.Entry<Geary.SpecialFolderType, string> e in mailbox_search_names) {
- compiled.set(e.key, Geary.iterate_array<string>(e.value.split("|"))
+ foreach (Geary.SpecialFolderType t in mailbox_search_names.keys) {
+ compiled.set(t, Geary.iterate_array<string>(mailbox_search_names.get(t).split("|"))
.map<string>(n => n.strip()).to_array_list());
}
@@ -496,7 +496,7 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.AbstractAccount {
return new Imap.FolderRoot(name, null);
}
- public virtual async Geary.Folder ensure_special_folder_async(Geary.SpecialFolderType special,
+ public override async Geary.Folder ensure_special_folder_async(Geary.SpecialFolderType special,
Cancellable? cancellable) throws Error {
switch (special) {
case Geary.SpecialFolderType.DRAFTS:
@@ -517,7 +517,7 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.AbstractAccount {
if (folder != null)
return folder;
- Geary.FolderPath path = get_create_special_folder_path(name);
+ Geary.FolderPath path = get_create_special_folder_path(special);
yield remote.create_folder_async(path, cancellable);
return yield fetch_folder_async(path, cancellable);
}
diff --git a/src/engine/util/util-iterable.vala b/src/engine/util/util-iterable.vala
index f24a518..17ea7dc 100644
--- a/src/engine/util/util-iterable.vala
+++ b/src/engine/util/util-iterable.vala
@@ -31,7 +31,7 @@ namespace Geary {
/**
* Take an array of items and return a Geary.Iterable for convenience.
*/
- public Geary.Iterable<G> iterate_array(G[] a) {
+ public Geary.Iterable<G> iterate_array<G>(G[] a) {
return Geary.traverse<G>(new Gee.ArrayList<G>.wrap(a));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]