colord/variant-iter.patch
Matthias Clasen 7ac06cffda More fixes
2012-01-20 12:55:19 -05:00

27 lines
1.2 KiB
Diff

diff -up colord-0.1.16/libcolord/cd-device.c.iter colord-0.1.16/libcolord/cd-device.c
--- colord-0.1.16/libcolord/cd-device.c.iter 2012-01-20 12:54:20.620011834 -0500
+++ colord-0.1.16/libcolord/cd-device.c 2012-01-20 12:54:32.586012014 -0500
@@ -472,8 +472,7 @@ cd_device_set_metadata_from_variant (CdD
g_hash_table_remove_all (device->priv->metadata);
/* insert the new metadata */
- g_variant_get (variant, "a{ss}",
- &iter);
+ g_variant_iter_init (&iter, variant);
while (g_variant_iter_loop (iter, "{ss}",
&prop_key, &prop_value)) {
g_hash_table_insert (device->priv->metadata,
diff -up colord-0.1.16/libcolord/cd-profile.c.iter colord-0.1.16/libcolord/cd-profile.c
--- colord-0.1.16/libcolord/cd-profile.c.iter 2011-09-13 07:38:56.000000000 -0400
+++ colord-0.1.16/libcolord/cd-profile.c 2012-01-20 12:54:02.525011562 -0500
@@ -440,8 +440,7 @@ cd_profile_set_metadata_from_variant (Cd
g_hash_table_remove_all (profile->priv->metadata);
/* insert the new metadata */
- g_variant_get (variant, "a{ss}",
- &iter);
+ g_variant_iter_init (&iter, variant);
while (g_variant_iter_loop (iter, "{ss}",
&prop_key, &prop_value)) {
g_hash_table_insert (profile->priv->metadata,