diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-08-10 11:12:32 +0200 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-08-15 11:36:15 -0400 |
| commit | 07b425f2cd9d52b64207166aa8d02ab2408ed84e (patch) | |
| tree | 8a0495b22d85765ee9474ea2b7a525d818a03f96 | |
| parent | fb3c75b672a6391691c8fe37fbd8f6d1bcfb85ca (diff) | |
| download | gconf-07b425f2cd9d52b64207166aa8d02ab2408ed84e.tar.gz | |
GSettings migration: use time() as the timestamp
Store the current system time as the timestamp in the database instead
of the timestamp that we read from the directory containing the
migration scripts.
| -rw-r--r-- | gsettings/gsettings-data-convert.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c index 0d3c8c27..b0c8b9c8 100644 --- a/gsettings/gsettings-data-convert.c +++ b/gsettings/gsettings-data-convert.c @@ -364,8 +364,7 @@ load_state (time_t *mtime, } static gboolean -save_state (time_t mtime, - gchar **converted) +save_state (gchar **converted) { gchar *filename; GKeyFile *keyfile; @@ -384,7 +383,7 @@ save_state (time_t mtime, filename = g_build_filename (g_get_user_data_dir (), "gsettings-data-convert", NULL); keyfile = g_key_file_new (); - str = g_strdup_printf ("%ld", mtime); + str = g_strdup_printf ("%ld", time (NULL)); g_key_file_set_string (keyfile, "State", "timestamp", str); g_free (str); @@ -507,7 +506,7 @@ main (int argc, char *argv[]) if (!dry_run) { - if (!save_state (dir_mtime, converted)) + if (!save_state (converted)) return 1; } |