diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-08-15 11:41:58 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-08-15 11:42:31 -0400 |
| commit | 8c1e6f2ed3379fb93db7ba4067371f7b6ce3d348 (patch) | |
| tree | 994454f2223bed3ee498d528a403e0f000d732c1 | |
| parent | 581ac91a973ec7f81c497544a5d793f75e3cc647 (diff) | |
| download | gconf-8c1e6f2ed3379fb93db7ba4067371f7b6ce3d348.tar.gz | |
GSettings migration: consult XDG_DATA_DIRS
Instead of using the hardcoded compile-time DATADIR, consult
XDG_DATA_DIRS.
https://bugzilla.gnome.org/show_bug.cgi?id=656262
| -rw-r--r-- | gsettings/gsettings-data-convert.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c index 21dcf6f9..14ef3d05 100644 --- a/gsettings/gsettings-data-convert.c +++ b/gsettings/gsettings-data-convert.c @@ -29,8 +29,6 @@ #include <gio/gio.h> #include <gconf/gconf-client.h> -static const gchar convert_dir[] = DATADIR "/GConf/gsettings"; - static gboolean changed = FALSE; static gboolean verbose = FALSE; static gboolean dry_run = FALSE; @@ -528,6 +526,8 @@ int main (int argc, char *argv[]) { time_t stored_mtime; + const gchar * const *data_dirs; + gint i; GError *error; GHashTable *converted; GOptionContext *context; @@ -555,8 +555,18 @@ main (int argc, char *argv[]) converted = load_state (&stored_mtime); - if (!handle_dir (convert_dir, stored_mtime, converted)) - return 1; + data_dirs = g_get_system_data_dirs (); + for (i = 0; data_dirs[i]; i++) + { + gchar *convert_dir; + + convert_dir = g_build_filename (data_dirs[i], "GConf", "gsettings", NULL); + + if (!handle_dir (convert_dir, stored_mtime, converted)) + return 1; + + g_free (convert_dir); + } if (changed && !dry_run) { |