From 4f41ce61593a5283b8a7763c7c19acbbd02e8a05 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Mon, 19 Apr 2021 21:24:14 +1000
Subject: [PATCH] client: Fix invalid GObject property name

`_instance` is not a valid property name.
---
 .../application-email-store-factory.vala           | 14 +++++++-------
 .../application-folder-store-factory.vala          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/client/application/application-email-store-factory.vala b/src/client/application/application-email-store-factory.vala
index c5c5925e..21d28c5d 100644
--- a/src/client/application/application-email-store-factory.vala
+++ b/src/client/application/application-email-store-factory.vala
@@ -55,8 +55,8 @@ internal class Application.EmailStoreFactory : Geary.BaseObject {
             foreach (Plugin.EmailIdentifier plugin_id in plugin_ids) {
                 IdImpl? id_impl = plugin_id as IdImpl;
                 if (id_impl != null) {
-                    if (id_impl._account.backing != current_account) {
-                        current_account = id_impl._account.backing;
+                    if (id_impl.account_impl.backing != current_account) {
+                        current_account = id_impl.account_impl.backing;
                         engine_ids = found_accounts.get(current_account);
                         if (engine_ids == null) {
                             engine_ids = new Gee.HashSet<Geary.EmailIdentifier>();
@@ -230,8 +230,8 @@ internal class Application.EmailStoreFactory : Geary.BaseObject {
         Gee.Hashable<Plugin.EmailIdentifier>, Plugin.EmailIdentifier {
 
 
-        public Plugin.Account account { get { return this._account; } }
-        internal PluginManager.AccountImpl _account { get; private set; }
+        public Plugin.Account account { get { return this.account_impl; } }
+        internal PluginManager.AccountImpl account_impl;
 
         internal Geary.EmailIdentifier backing { get; private set; }
 
@@ -239,12 +239,12 @@ internal class Application.EmailStoreFactory : Geary.BaseObject {
         internal IdImpl(Geary.EmailIdentifier backing,
                         PluginManager.AccountImpl account) {
             this.backing = backing;
-            this._account = account;
+            this.account_impl = account;
         }
 
         public GLib.Variant to_variant() {
             return new GLib.Variant.tuple({
-                    this._account.backing.account.information.id,
+                    this.account_impl.backing.account.information.id,
                         new GLib.Variant.variant(this.backing.to_variant())
             });
         }
@@ -257,7 +257,7 @@ internal class Application.EmailStoreFactory : Geary.BaseObject {
             return (
                 impl != null &&
                 this.backing.equal_to(impl.backing) &&
-                this._account.backing == impl._account.backing
+                this.account_impl.backing == impl.account_impl.backing
             );
         }
 
diff --git a/src/client/application/application-folder-store-factory.vala b/src/client/application/application-folder-store-factory.vala
index e1eb4e6f..abcc1453 100644
--- a/src/client/application/application-folder-store-factory.vala
+++ b/src/client/application/application-folder-store-factory.vala
@@ -42,7 +42,7 @@ internal class Application.FolderStoreFactory : Geary.BaseObject {
             var folders = new Gee.LinkedList<Plugin.Folder>();
             var id = target as EmailStoreFactory.IdImpl;
             if (id != null) {
-                var context = id._account.backing;
+                var context = id.account_impl.backing;
                 Gee.MultiMap<Geary.EmailIdentifier,Geary.FolderPath>? multi_folders =
                     yield context.account.get_containing_folders_async(
                         Geary.Collection.single(id.backing),