summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-15 12:27:16 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-15 12:28:12 -0400
commitc9e5642b2b643b8e75a7fa24d8527c4c956f048b (patch)
tree05397fa33f0afb536f14ebd762d5828b0c96a16d /engine
parent8becbe77bb78c0fe0641d4eeb592803c7b5737f8 (diff)
downloaddconf-c9e5642b2b643b8e75a7fa24d8527c4c956f048b.tar.gz
engine: fix arguments in fast watch race case
In the case we do a fast watch and hit the race condition of a change occuring before our watch is established we need to emit a change signal on "/". The arguments for that were incorrect, so fix them.
Diffstat (limited to 'engine')
-rw-r--r--engine/dconf-engine.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
index 9e44f46..9c80d9b 100644
--- a/engine/dconf-engine.c
+++ b/engine/dconf-engine.c
@@ -721,13 +721,15 @@ dconf_engine_watch_established (DConfEngine *engine,
if (ow->state != dconf_engine_get_state (engine))
{
+ const gchar * const changes[] = { "", NULL };
+
/* Our recorded state does not match the current state. Something
* must have changed while our watch requests were on the wire.
*
* We don't know what changed, so we can just say that potentially
* everything changed. This case is very rare, anyway...
*/
- dconf_engine_change_notify (engine, "/", NULL, engine->user_data, NULL);
+ dconf_engine_change_notify (engine, "/", changes, NULL, engine->user_data);
}
dconf_engine_call_handle_free (handle);