diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2010-05-22 17:07:31 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2010-05-22 17:07:31 -0400 |
| commit | a7053e1dd9c4e24cb4c915af047214e7c75e1464 (patch) | |
| tree | b068438fe3696651f1120bf95c98ce3fc236f6a8 /gsettings | |
| parent | aa1ce03e2541bf625d25b120f86442c2a6b8ad58 (diff) | |
| download | dconf-a7053e1dd9c4e24cb4c915af047214e7c75e1464.tar.gz | |
refactor, add client library, add 'dconf' command
Only very preliminary functionality for all of these.
Diffstat (limited to 'gsettings')
| -rw-r--r-- | gsettings/Makefile.am | 2 | ||||
| -rw-r--r-- | gsettings/dconfsettingsbackend.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am index 3e8f4c0..d32efb4 100644 --- a/gsettings/Makefile.am +++ b/gsettings/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(gio_CFLAGS) -I$(top_srcdir) +AM_CFLAGS = $(gio_CFLAGS) -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine -I$(top_srcdir)/common giomodules_LTLIBRARIES = libdconfsettings.la diff --git a/gsettings/dconfsettingsbackend.c b/gsettings/dconfsettingsbackend.c index b0ff876..c15da74 100644 --- a/gsettings/dconfsettingsbackend.c +++ b/gsettings/dconfsettingsbackend.c @@ -21,7 +21,7 @@ #define G_SETTINGS_ENABLE_BACKEND #include <gio/gsettingsbackend.h> -#include <engine/dconf-engine.h> +#include <dconf-engine.h> #include <gio/gio.h> #include <string.h> @@ -248,7 +248,7 @@ dconf_settings_backend_read (GSettingsBackend *backend, gboolean default_value) { DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend; - DConfEngineReadType type; + DConfReadType type; if (!default_value) { @@ -257,12 +257,12 @@ dconf_settings_backend_read (GSettingsBackend *backend, if (dconf_settings_backend_scan_outstanding (dcsb, key, &value)) return value; - type = DCONF_ENGINE_READ_NORMAL; + type = DCONF_READ_NORMAL; } else - type = DCONF_ENGINE_READ_RESET; + type = DCONF_READ_RESET; - return dconf_engine_read (dcsb->engine, key, expected_type, type); + return dconf_engine_read (dcsb->engine, key, type); } static void |