diff options
author | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-11-15 22:16:43 +0000 |
---|---|---|
committer | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2018-11-15 22:16:43 +0000 |
commit | 7a033fa8b762c2a247e32317ffd436dd6403c942 (patch) | |
tree | 4b5ee47926e31f2033da2219952939fa48a22672 /bin | |
parent | 5afa4dec7f9ef84dccb7365666aa960b1834ce48 (diff) | |
parent | 51c1e419c38d1d2078b3bdbd552ad7643c58aaa5 (diff) | |
download | dconf-7a033fa8b762c2a247e32317ffd436dd6403c942.tar.gz |
Merge branch 'integration-test' into 'master'
Add integration tests
See merge request GNOME/dconf!31
Diffstat (limited to 'bin')
-rw-r--r-- | bin/dconf-dump.vala | 13 | ||||
-rw-r--r-- | bin/dconf.vala | 5 | ||||
-rw-r--r-- | bin/meson.build | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/bin/dconf-dump.vala b/bin/dconf-dump.vala index 135b230..d63e3eb 100644 --- a/bin/dconf-dump.vala +++ b/bin/dconf-dump.vala @@ -8,7 +8,18 @@ void add_to_keyfile (KeyFile kf, DConf.Client client, string topdir, string? rel this_group = "/"; } - foreach (var item in client.list (this_dir)) { + var items = client.list (this_dir); + GLib.qsort_with_data<string> (items, sizeof (string), (a, b) => { + var a_dir = a.has_suffix ("/"); + var b_dir = b.has_suffix ("/"); + if (a_dir != b_dir) { + return (int) a_dir - (int) b_dir; + } else { + return GLib.strcmp (a, b); + } + }); + + foreach (var item in items) { if (item.has_suffix ("/")) { add_to_keyfile (kf, client, topdir, rel + item); } else { diff --git a/bin/dconf.vala b/bin/dconf.vala index 349e1ea..8b0f211 100644 --- a/bin/dconf.vala +++ b/bin/dconf.vala @@ -186,7 +186,10 @@ void dconf_list (string?[] args) throws Error { DConf.verify_dir (dir); - foreach (var item in client.list (dir)) { + var items = client.list (dir); + GLib.qsort_with_data<string> (items, sizeof (string), (a, b) => GLib.strcmp (a, b)); + + foreach (var item in items) { print ("%s\n", item); } } diff --git a/bin/meson.build b/bin/meson.build index 763a10b..6fd4ca2 100644 --- a/bin/meson.build +++ b/bin/meson.build @@ -11,7 +11,7 @@ bin_deps = [ valac.find_library('posix'), ] -executable( +dconf = executable( 'dconf', sources, include_directories: top_inc, |