luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

GDelayedSettingsBackend: another mandatory fixup

Browse Source 
- emit the "has-unapplied" property notify if dropping the last key
    from the changeset due to a mandatory key
This commit is contained in:
Ryan Lortie
2010-04-17 11:58:52 -04:00
parent e06e441ac2
commit 118ae129bc
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gio/gdelayedsettingsbackend.c
View File

@@ -249,6 +249,11 @@ delayed_backend_writable_changed (GSettingsBackend *backend,
* no need to signal this since the writable change implies it. * no need to signal this since the writable change implies it.
*/ */
g_tree_remove (delayed->priv->delayed, key); g_tree_remove (delayed->priv->delayed, key);
/* if that was the only key... */
if (delayed->priv->owner &&
g_tree_nnodes (delayed->priv->delayed) == 0)
g_object_notify (delayed->priv->owner, "has-unapplied");
} }
g_settings_backend_writable_changed (G_SETTINGS_BACKEND (delayed), key); g_settings_backend_writable_changed (G_SETTINGS_BACKEND (delayed), key);
@@ -282,20 +287,30 @@ delayed_backend_path_writable_changed (GSettingsBackend *backend,
gpointer user_data) gpointer user_data)
{ {
GDelayedSettingsBackend *delayed = G_DELAYED_SETTINGS_BACKEND (user_data); GDelayedSettingsBackend *delayed = G_DELAYED_SETTINGS_BACKEND (user_data);
CheckPrefixState state = { path, }; gsize n_keys;
gsize i;
/* collect a list of possibly-affected keys (ie: matching the path) */ n_keys = g_tree_nnodes (delayed->priv->delayed);
state.keys = g_new (const gchar *, g_tree_nnodes (delayed->priv->delayed));
g_tree_foreach (delayed->priv->delayed, check_prefix, &state);
/* drop the keys that have been affected */ if (n_keys > 0)
for (i = 0; i < state.index; i++) {
if (!g_settings_backend_get_writable (delayed->priv->backend, CheckPrefixState state = { path, g_new (const gchar *, n_keys) };
state.keys[i])) gsize i;
g_tree_remove (delayed->priv->delayed, state.keys[i]);
g_free (state.keys); /* collect a list of possibly-affected keys (ie: matching the path) */
g_tree_foreach (delayed->priv->delayed, check_prefix, &state);
/* drop the keys that have been affected */
for (i = 0; i < state.index; i++)
if (!g_settings_backend_get_writable (delayed->priv->backend,
state.keys[i]))
g_tree_remove (delayed->priv->delayed, state.keys[i]);
g_free (state.keys);
if (delayed->priv->owner &&
g_tree_nnodes (delayed->priv->delayed) == 0)
g_object_notify (delayed->priv->owner, "has-unapplied");
}
g_settings_backend_path_writable_changed (G_SETTINGS_BACKEND (delayed), g_settings_backend_path_writable_changed (G_SETTINGS_BACKEND (delayed),
path); path);