diff options
author | Ryan Lortie <desrt@desrt.ca> | 2013-02-04 12:37:49 +0100 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2013-02-11 13:36:09 -0500 |
commit | 4c516a76f55d75ecfa1b985adb1905cac945f3fe (patch) | |
tree | 19d0d22ce73ee8d5c19f2c39135b537ab17f2266 /engine | |
parent | 9d0b53f86371a459615e9872a5b835b917a568ae (diff) | |
download | dconf-4c516a76f55d75ecfa1b985adb1905cac945f3fe.tar.gz |
engine, gsettings: prevent empty changesets
We should not send empty changesets to the service so just ignore them
when we get them.
This now means that an empty 'dconf load' will not send any D-Bus
messages (and will not cause D-Bus activation).
Diffstat (limited to 'engine')
-rw-r--r-- | engine/dconf-engine.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c index 45e1d66..446619e 100644 --- a/engine/dconf-engine.c +++ b/engine/dconf-engine.c @@ -1029,6 +1029,9 @@ dconf_engine_change_fast (DConfEngine *engine, { GList *node; + if (dconf_changeset_is_empty (changeset)) + return TRUE; + if (!dconf_engine_changeset_changes_only_writable_keys (engine, changeset, error)) return FALSE; @@ -1091,6 +1094,14 @@ dconf_engine_change_sync (DConfEngine *engine, { GVariant *reply; + if (dconf_changeset_is_empty (changeset)) + { + if (tag) + *tag = g_strdup (""); + + return TRUE; + } + if (!dconf_engine_changeset_changes_only_writable_keys (engine, changeset, error)) return FALSE; |