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

Application.Client: Rename app user dirs to home dirs

Browse source
This commit is contained in:
Michael Gratton 2020-10-13 23:40:02 +11:00 • committed by Michael James Gratton
parent 6934841484
commit 468ea6df58
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client/application/application-client.vala
View file

@ -759,22 +759,22 @@ public class Application.Client : Gtk.Application {
}
}
/** Returns the application's base user configuration directory. */
public GLib.File get_user_config_directory() {
/** Returns the application's base home configuration directory. */
public GLib.File get_home_config_directory() {
return GLib.File.new_for_path(
Environment.get_user_config_dir()
).get_child("geary");
}
/** Returns the application's base user cache directory. */
public GLib.File get_user_cache_directory() {
/** Returns the application's base home cache directory. */
public GLib.File get_home_cache_directory() {
return GLib.File.new_for_path(
GLib.Environment.get_user_cache_dir()
).get_child("geary");
}
/** Returns the application's base user data directory. */
public GLib.File get_user_data_directory() {
/** Returns the application's base home data directory. */
public GLib.File get_home_data_directory() {
return GLib.File.new_for_path(
GLib.Environment.get_user_data_dir()
).get_child("geary");

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

@ -125,8 +125,8 @@ 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();
GLib.File config_dir = application.get_home_config_directory();
GLib.File data_dir = application.get_home_data_directory();
// This initializes the IconFactory, important to do before
// the actions are created (as they refer to some of Geary's
@ -140,7 +140,9 @@ internal class Application.Controller :
Components.WebView.init_web_context(
this.application.config,
this.application.get_web_extensions_dir(),
this.application.get_user_cache_directory().get_child("web-resources")
this.application.get_home_cache_directory().get_child(
"web-resources"
)
);
Components.WebView.load_resources(config_dir);
Composer.WebView.load_resources();