[geary] Replace invalid GObject properties with getters.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Replace invalid GObject properties with getters.
- Date: Mon, 25 Sep 2017 13:22:20 +0000 (UTC)
commit edd631d35a46d13a8817984e4e9d857e704cce24
Author: Michael James Gratton <mike vee net>
Date: Mon Sep 25 23:21:33 2017 +1000
Replace invalid GObject properties with getters.
This is another fix for compilation under newer vala versions - see vala
Bug 693932 for details.
.../gmail/imap-engine-gmail-account.vala | 8 ++++----
.../imap-engine/imap-engine-generic-account.vala | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
index 6f292cb..9dbf1cd 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
@@ -30,15 +30,15 @@ private class Geary.ImapEngine.GmailAccount : Geary.ImapEngine.GenericAccount {
Smtp.ClientConnection.DEFAULT_TIMEOUT_SEC);
}
- protected override Geary.SpecialFolderType[] supported_special_folders {
- get { return SUPPORTED_SPECIAL_FOLDERS; }
- }
-
public GmailAccount(string name, Geary.AccountInformation account_information,
Imap.Account remote, ImapDB.Account local) {
base (name, account_information, remote, local);
}
+ protected override Geary.SpecialFolderType[] get_supported_special_folders() {
+ return SUPPORTED_SPECIAL_FOLDERS;
+ }
+
protected override MinimalFolder new_folder(Geary.FolderPath path, Imap.Account remote_account,
ImapDB.Account local_account, ImapDB.Folder local_folder) {
SpecialFolderType special_folder_type;
diff --git a/src/engine/imap-engine/imap-engine-generic-account.vala
b/src/engine/imap-engine/imap-engine-generic-account.vala
index 5896743..5625c26 100644
--- a/src/engine/imap-engine/imap-engine-generic-account.vala
+++ b/src/engine/imap-engine/imap-engine-generic-account.vala
@@ -19,10 +19,6 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
private static Geary.FolderPath? outbox_path = null;
private static Geary.FolderPath? search_path = null;
- protected virtual Geary.SpecialFolderType[] supported_special_folders {
- get { return SUPPORTED_SPECIAL_FOLDERS; }
- }
-
private Imap.Account remote;
private ImapDB.Account local;
private bool open = false;
@@ -508,7 +504,11 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
public override Geary.ContactStore get_contact_store() {
return local.contact_store;
}
-
+
+ protected virtual Geary.SpecialFolderType[] get_supported_special_folders() {
+ return SUPPORTED_SPECIAL_FOLDERS;
+ }
+
public override async bool folder_exists_async(Geary.FolderPath path,
Cancellable? cancellable = null) throws Error {
check_open();
@@ -593,7 +593,7 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
* session's language. Also checks for lower-case versions of
* each.
*/
- foreach (Geary.SpecialFolderType type in this.supported_special_folders) {
+ foreach (Geary.SpecialFolderType type in get_supported_special_folders()) {
Gee.List<string> compiled = new Gee.ArrayList<string>();
foreach (string names in get_special_search_names(type)) {
foreach (string name in names.split("|")) {
@@ -748,7 +748,7 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
public override async Geary.Folder get_required_special_folder_async(Geary.SpecialFolderType special,
Cancellable? cancellable) throws Error {
- if (!(special in this.supported_special_folders)) {
+ if (!(special in get_supported_special_folders())) {
throw new EngineError.BAD_PARAMETERS(
"Invalid special folder type %s passed to get_required_special_folder_async",
special.to_string());
@@ -759,7 +759,7 @@ private abstract class Geary.ImapEngine.GenericAccount : Geary.Account {
}
private async void ensure_special_folders_async(Cancellable? cancellable) throws Error {
- foreach (Geary.SpecialFolderType special in this.supported_special_folders)
+ foreach (Geary.SpecialFolderType special in get_supported_special_folders())
yield ensure_special_folder_async(special, cancellable);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]