diff options
author | Allison Ryan Lortie <desrt@desrt.ca> | 2015-12-16 10:16:15 -0500 |
---|---|---|
committer | Allison Ryan Lortie <desrt@desrt.ca> | 2015-12-16 11:31:06 -0500 |
commit | 4a80e6ce540d4ce652ccf963cdb4fb44cb514a5b (patch) | |
tree | ce40de8eb00a04152b69676666fef35105f7e74d /bin | |
parent | 177740fe165f0c4f6215412f509c96b3a6fef336 (diff) | |
download | dconf-4a80e6ce540d4ce652ccf963cdb4fb44cb514a5b.tar.gz |
client: replace _read_default() with _read_full()
This API has never appeared in a released version of dconf (even
unstable). Replace it with a more generally-useful form.
Update the test cases, dconf commandline tool and vapi accordingly.
https://bugzilla.gnome.org/show_bug.cgi?id=759128
Diffstat (limited to 'bin')
-rw-r--r-- | bin/dconf.vala | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/bin/dconf.vala b/bin/dconf.vala index 1c054cd..9704d4a 100644 --- a/bin/dconf.vala +++ b/bin/dconf.vala @@ -161,11 +161,11 @@ void dconf_help (string[] args) throws Error { void dconf_read (string?[] args) throws Error { var client = new DConf.Client (); - bool read_default = false; + var flags = DConf.ReadFlags.NONE; var index = 2; if (args[index] == "-d") { - read_default = true; + flags = DConf.ReadFlags.DEFAULT_VALUE; index++; } @@ -173,13 +173,7 @@ void dconf_read (string?[] args) throws Error { DConf.verify_key (key); - Variant? result; - - if (read_default) { - result = client.read_default (key); - } else { - result = client.read (key); - } + var result = client.read_full (key, flags, null); if (result != null) { print ("%s\n", result.print (true)); |