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

Replace invalid GObject properties with getters.

Browse source 
This is another fix for compilation under newer vala versions - see vala
Bug 693932 for details.
This commit is contained in:
Michael James Gratton 2017-09-25 23:21:33 +10:00
parent 8a20a4592c
commit edd631d35a
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
View file

@ -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;

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

@ -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);
}