luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1309-delayed-settings-changed' into 'master'

Browse Source 
gsettings: Add missing changed() call to delayed settings backend

Closes #1309

See merge request GNOME/glib!1046
This commit is contained in:
Emmanuele Bassi 2019-09-02 11:14:59 +00:00
commit a0cbb32680
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdelayedsettingsbackend.c
View File

@ -204,6 +204,8 @@ g_delayed_settings_backend_reset (GSettingsBackend *backend,
g_tree_insert (delayed->priv->delayed, g_strdup (key), NULL);
g_mutex_unlock (&delayed->priv->lock);
g_settings_backend_changed (backend, key, origin_tag);
if (was_empty)
g_delayed_settings_backend_notify_unapplied (delayed);
}

18
gio/tests/gsettings.c
View File

@ -509,6 +509,24 @@ test_delay_apply (void)
g_assert_true (changed_cb_called);
g_assert_false (changed_cb_called2);
/* Try resetting the key and ensure a notification is emitted on the delayed #GSettings object. */
changed_cb_called = FALSE;
changed_cb_called2 = FALSE;
g_settings_reset (settings, "greeting");
g_assert_true (changed_cb_called);
g_assert_false (changed_cb_called2);
/* Locally change the greeting again. */
changed_cb_called = FALSE;
changed_cb_called2 = FALSE;
g_settings_set (settings, "greeting", "s", "greetings from test_delay_apply");
g_assert_true (changed_cb_called);
g_assert_false (changed_cb_called2);
writable = g_settings_is_writable (settings, "greeting");
g_assert_true (writable);