diff options
| author | Allison Ryan Lortie <desrt@desrt.ca> | 2015-12-16 14:52:19 +0000 |
|---|---|---|
| committer | Allison Ryan Lortie <desrt@desrt.ca> | 2015-12-16 11:30:57 -0500 |
| commit | a4139891fa874197e945fe409698e16a5ba35ae3 (patch) | |
| tree | cbcb4ba5677e50b7d917e6c7cf5afc2875421733 /gsettings | |
| parent | 7beac020f79da20e25966d6a19bc47f2e6542e92 (diff) | |
| download | dconf-a4139891fa874197e945fe409698e16a5ba35ae3.tar.gz | |
engine: merge _read and _read_user_value()
Delete the separate dconf_engine_read_user_value() and merge its
functionality into dconf_engine_read() by adding a flags field.
https://bugzilla.gnome.org/show_bug.cgi?id=759128
Diffstat (limited to 'gsettings')
| -rw-r--r-- | gsettings/dconfsettingsbackend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gsettings/dconfsettingsbackend.c b/gsettings/dconfsettingsbackend.c index 1b9aa16..0e96f5e 100644 --- a/gsettings/dconfsettingsbackend.c +++ b/gsettings/dconfsettingsbackend.c @@ -53,12 +53,12 @@ dconf_settings_backend_read (GSettingsBackend *backend, /* Mark the key as having been reset when trying to do the read... */ read_through = g_queue_new (); g_queue_push_tail (read_through, dconf_changeset_new_write (key, NULL)); - value = dconf_engine_read (dcsb->engine, read_through, key); + value = dconf_engine_read (dcsb->engine, DCONF_READ_FLAGS_NONE, read_through, key); g_queue_free_full (read_through, (GDestroyNotify) dconf_changeset_unref); } else - value = dconf_engine_read (dcsb->engine, NULL, key); + value = dconf_engine_read (dcsb->engine, DCONF_READ_FLAGS_NONE, NULL, key); return value; } @@ -70,7 +70,7 @@ dconf_settings_backend_read_user_value (GSettingsBackend *backend, { DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend; - return dconf_engine_read_user_value (dcsb->engine, NULL, key); + return dconf_engine_read (dcsb->engine, DCONF_READ_USER_VALUE, NULL, key); } static gboolean |