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

client: Move Migrate namespace to be under Util

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

2
src/client/application/application-configuration.vala
View file

@ -146,7 +146,7 @@ public class Application.Configuration : Geary.BaseObject {
settings = new Settings(schema_id);
gnome_interface = new Settings("org.gnome.desktop.interface");
Migrate.old_app_config(settings);
Util.Migrate.old_app_config(settings);
this.bind(SINGLE_KEY_SHORTCUTS, this, SINGLE_KEY_SHORTCUTS);
}

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

@ -171,8 +171,10 @@ internal class Application.Controller :
);
// Migrate configuration if necessary.
Migrate.xdg_config_dir(this.application.get_user_data_directory(),
this.application.get_user_config_directory());
Util.Migrate.xdg_config_dir(
this.application.get_user_data_directory(),
this.application.get_user_config_directory()
);
// Hook up cert, accounts and credentials machinery

2
src/client/util/util-migrate.vala
View file

@ -4,7 +4,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
namespace Migrate {
namespace Util.Migrate {
private const string GROUP = "AccountInformation";
private const string PRIMARY_EMAIL_KEY = "primary_email";
private const string SETTINGS_FILENAME = Accounts.Manager.SETTINGS_FILENAME;