Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
Geary
Commits
e8061379
Commit
e8061379
authored
Oct 13, 2020
by
Michael Gratton
Committed by
Michael Gratton
Oct 14, 2020
Browse files
Application.Controller: Clean up config/data vars in ctor
parent
d7e05ab2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/client/application/application-controller.vala
View file @
e8061379
...
...
@@ -125,6 +125,9 @@ internal class Application.Controller :
this
.
application
=
application
;
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
// the actions are created (as they refer to some of Geary's
// custom icons)
...
...
@@ -139,9 +142,7 @@ internal class Application.Controller :
this
.
application
.
get_web_extensions_dir
(),
this
.
application
.
get_user_cache_directory
().
get_child
(
"web-resources"
)
);
Components
.
WebView
.
load_resources
(
this
.
application
.
get_user_config_directory
()
);
Components
.
WebView
.
load_resources
(
config_dir
);
Composer
.
WebView
.
load_resources
();
ConversationWebView
.
load_resources
();
Accounts
.
SignatureWebView
.
load_resources
();
...
...
@@ -179,7 +180,7 @@ internal class Application.Controller :
// Hook up cert, accounts and credentials machinery
this
.
certificate_manager
=
yield
new
Application
.
CertificateManager
(
this
.
application
.
get_user_data_directory
()
.
get_child
(
"pinned-certs"
),
config_dir
.
get_child
(
"pinned-certs"
),
cancellable
);
...
...
@@ -189,8 +190,8 @@ internal class Application.Controller :
this
.
account_manager
=
new
Accounts
.
Manager
(
libsecret
,
this
.
application
.
get_user_
config_dir
ectory
()
,
this
.
application
.
get_user_data_directory
()
config_dir
,
data_dir
);
this
.
account_manager
.
account_added
.
connect
(
on_account_added
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment