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

Application.Controller: Clean up config/data vars in ctor

Browse source
This commit is contained in:
Michael Gratton 2020-10-13 23:32:46 +11:00 • committed by Michael James Gratton
parent d7e05ab20e
commit e8061379ec
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/client/application/application-controller.vala
View file

@ -125,6 +125,9 @@ internal class Application.Controller :
this.application = application; this.application = application;
this.controller_open = cancellable; this.controller_open = cancellable;
GLib.File config_dir = application.get_user_config_directory();
GLib.File data_dir = application.get_user_data_directory();
// This initializes the IconFactory, important to do before // This initializes the IconFactory, important to do before
// the actions are created (as they refer to some of Geary's // the actions are created (as they refer to some of Geary's
// custom icons) // custom icons)
@ -139,9 +142,7 @@ internal class Application.Controller :
this.application.get_web_extensions_dir(), this.application.get_web_extensions_dir(),
this.application.get_user_cache_directory().get_child("web-resources") this.application.get_user_cache_directory().get_child("web-resources")
); );
Components.WebView.load_resources( Components.WebView.load_resources(config_dir);
this.application.get_user_config_directory()
);
Composer.WebView.load_resources(); Composer.WebView.load_resources();
ConversationWebView.load_resources(); ConversationWebView.load_resources();
Accounts.SignatureWebView.load_resources(); Accounts.SignatureWebView.load_resources();
@ -179,7 +180,7 @@ internal class Application.Controller :
// Hook up cert, accounts and credentials machinery // Hook up cert, accounts and credentials machinery
this.certificate_manager = yield new Application.CertificateManager( this.certificate_manager = yield new Application.CertificateManager(
this.application.get_user_data_directory().get_child("pinned-certs"), config_dir.get_child("pinned-certs"),
cancellable cancellable
); );
@ -189,8 +190,8 @@ internal class Application.Controller :
this.account_manager = new Accounts.Manager( this.account_manager = new Accounts.Manager(
libsecret, libsecret,
this.application.get_user_config_directory(), config_dir,
this.application.get_user_data_directory() data_dir
); );
this.account_manager.account_added.connect( this.account_manager.account_added.connect(
on_account_added on_account_added