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

gdelayedsettingsbackend: Fix applying after calling g_settings_reset()

Browse Source 
`g_settings_reset()` changes the value of the setting to `NULL`;
`add_to_tree()` was not handling that correctly.

Add a unit test.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2426
This commit is contained in:
Philip Withnall 2021-06-16 11:40:38 +01:00
parent 045a6fb771
commit 8b443c3556
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gdelayedsettingsbackend.c
View File

@ -156,7 +156,8 @@ add_to_tree (gpointer key,
gpointer value,
gpointer user_data)
{
g_tree_insert (user_data, g_strdup (key), g_variant_ref (value));
/* A value may be %NULL if its key has been reset */
g_tree_insert (user_data, g_strdup (key), (value != NULL) ? g_variant_ref (value) : NULL);
return FALSE;
}

55
gio/tests/gsettings.c
View File

@ -56,6 +56,15 @@ check_and_free (GVariant *value,
g_variant_unref (value);
}
/* Wrapper around g_assert_cmpstr() which gets a setting from a #GSettings
* using g_settings_get(). */
#define settings_assert_cmpstr(settings, key, op, expected_value) G_STMT_START { \
gchar *__str; \
g_settings_get ((settings), (key), "s", &__str); \
g_assert_cmpstr (__str, op, (expected_value)); \
g_free (__str); \
} G_STMT_END
/* Just to get warmed up: Read and set a string, and
* verify that can read the changed string back
@ -670,6 +679,51 @@ test_delay_child (void)
g_object_unref (base);
}
static void
test_delay_reset_key (void)
{
GSettings *direct_settings = NULL, *delayed_settings = NULL;
g_test_summary ("Test that resetting a key on a delayed settings instance works");
delayed_settings = g_settings_new ("org.gtk.test");
direct_settings = g_settings_new ("org.gtk.test");
g_settings_set (direct_settings, "greeting", "s", "ey up");
settings_assert_cmpstr (delayed_settings, "greeting", ==, "ey up");
/* Set up a delayed settings backend. */
g_settings_delay (delayed_settings);
g_settings_set (delayed_settings, "greeting", "s", "how do");
settings_assert_cmpstr (delayed_settings, "greeting", ==, "how do");
settings_assert_cmpstr (direct_settings, "greeting", ==, "ey up");
g_assert_true (g_settings_get_has_unapplied (delayed_settings));
g_settings_reset (delayed_settings, "greeting");
/* There are still unapplied settings, because the reset is resetting to the
* value from the schema, not the value from @direct_settings. */
g_assert_true (g_settings_get_has_unapplied (delayed_settings));
settings_assert_cmpstr (delayed_settings, "greeting", ==, "Hello, earthlings");
settings_assert_cmpstr (direct_settings, "greeting", ==, "ey up");
/* Apply the settings changes (i.e. the reset). */
g_settings_apply (delayed_settings);
g_assert_false (g_settings_get_has_unapplied (delayed_settings));
settings_assert_cmpstr (delayed_settings, "greeting", ==, "Hello, earthlings");
settings_assert_cmpstr (direct_settings, "greeting", ==, "Hello, earthlings");
g_object_unref (direct_settings);
g_object_unref (delayed_settings);
}
static void
keys_changed_cb (GSettings *settings,
const GQuark *keys,
@ -3114,6 +3168,7 @@ main (int argc, char *argv[])
g_test_add_func ("/gsettings/delay-apply", test_delay_apply);
g_test_add_func ("/gsettings/delay-revert", test_delay_revert);
g_test_add_func ("/gsettings/delay-child", test_delay_child);
g_test_add_func ("/gsettings/delay-reset-key", test_delay_reset_key);
g_test_add_func ("/gsettings/atomic", test_atomic);
g_test_add_func ("/gsettings/simple-binding", test_simple_binding);