diff options
| -rw-r--r-- | gio/gsettings.c | 2 | ||||
| -rw-r--r-- | gio/tests/gsettings.c | 10 | ||||
| -rw-r--r-- | glib/glib.symbols | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/gio/gsettings.c b/gio/gsettings.c index ebf38cbb8..aa4a7bfb3 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -1490,7 +1490,7 @@ g_settings_set_value (GSettings *settings, if (!g_settings_key_info_range_check (&info, value)) { - g_warning ("gsettings_set_value: value for key '%s' in schema '%s' " + g_warning ("g_settings_set_value: value for key '%s' in schema '%s' " "is outside of valid range", key, settings->priv->schema_name); diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c index 2f24a5243..b2f9d4fa4 100644 --- a/gio/tests/gsettings.c +++ b/gio/tests/gsettings.c @@ -62,7 +62,7 @@ test_basic (void) abort (); } g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*g_settings_type_check*"); + g_test_trap_assert_stderr ("*g_settings_set_value*expects type*"); } g_settings_get (settings, "greeting", "s", &str); @@ -1574,7 +1574,7 @@ test_enums (void) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) g_settings_set_string (settings, "test", "qux"); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); + g_test_trap_assert_stderr ("*g_settings_set_value*valid range*"); if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) g_settings_get_flags (settings, "test"); @@ -1633,7 +1633,7 @@ test_flags (void) g_settings_set_strv (settings, "f-test", (const gchar **) g_strsplit ("rock", ",", 0)); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); + g_test_trap_assert_stderr ("*g_settings_set_value*valid range*"); if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) g_settings_get_enum (settings, "f-test"); @@ -1692,12 +1692,12 @@ test_range (void) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) g_settings_set_int (settings, "val", 45); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); + g_test_trap_assert_stderr ("*g_settings_set_value*valid range*"); if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) g_settings_set_int (settings, "val", 1); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); + g_test_trap_assert_stderr ("*g_settings_set_value*valid range*"); } g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33); diff --git a/glib/glib.symbols b/glib/glib.symbols index 73ec8565e..92f62f2f6 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -1675,6 +1675,7 @@ g_get_user_cache_dir g_get_user_config_dir g_get_user_data_dir g_reload_user_special_dirs_cache +g_get_user_runtime_dir g_get_user_special_dir #ifndef _WIN64 g_get_user_name PRIVATE |