Merge branch 'backport-2325-macos-settings-fix-glib-2-70' into 'glib-2-70'

Backport !2325 “Fix GSettings dict error macOS” to glib-2-70

See merge request GNOME/glib!2337
This commit is contained in:
Sebastian Dröge 2021-11-16 15:00:01 +00:00
commit 54130f153a

View File

@ -444,17 +444,17 @@ g_nextstep_settings_backend_get_ns_object (GVariant *variant)
{ {
NSMutableDictionary *dictionary; NSMutableDictionary *dictionary;
GVariantIter iter; GVariantIter iter;
GVariant *name; const gchar *name;
GVariant *value; GVariant *value;
dictionary = [NSMutableDictionary dictionaryWithCapacity:g_variant_iter_init (&iter, variant)]; dictionary = [NSMutableDictionary dictionaryWithCapacity:g_variant_iter_init (&iter, variant)];
while (g_variant_iter_loop (&iter, "{s*}", &name, &value)) while (g_variant_iter_loop (&iter, "{&s*}", &name, &value))
{ {
NSString *key; NSString *key;
id object; id object;
key = [NSString stringWithUTF8String:g_variant_get_string (name, NULL)]; key = [NSString stringWithUTF8String:name];
object = g_nextstep_settings_backend_get_ns_object (value); object = g_nextstep_settings_backend_get_ns_object (value);
[dictionary setObject:object forKey:key]; [dictionary setObject:object forKey:key];