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

Merge branch 'mjog/invalid-gobject-property' into 'mainline'

Browse source 
client: Fix invalid GObject property name

See merge request GNOME/geary!697
This commit is contained in:
Michael Gratton 2021-04-20 22:45:28 +00:00
commit 2b15c80718
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/client/application/application-email-store-factory.vala
View file

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

2
src/client/application/application-folder-store-factory.vala
View file

@ -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),