colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-core/utils: allow use of bytestring with attributes

Browse Source
This commit is contained in:
Lubomir Rintel
2017-12-04 14:38:21 +01:00
parent 47b1dc3828
commit 18dd937b81
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-core/nm-utils.c
View File

@@ -5511,6 +5511,8 @@ nm_utils_parse_variant_attributes (const char *string,
variant = g_variant_new_boolean (b); variant = g_variant_new_boolean (b);
} else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_STRING)) { } else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_STRING)) {
variant = g_variant_new_take_string (g_steal_pointer (&value)); variant = g_variant_new_take_string (g_steal_pointer (&value));
} else if (g_variant_type_equal ((*s)->type, G_VARIANT_TYPE_BYTESTRING)) {
variant = g_variant_new_bytestring (value);
} else { } else {
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
_("unsupported attribute '%s' of type '%s'"), (*s)->name, _("unsupported attribute '%s' of type '%s'"), (*s)->name,
@@ -5580,6 +5582,8 @@ nm_utils_format_variant_attributes (GHashTable *attributes,
value = g_variant_get_boolean (variant) ? "true" : "false"; value = g_variant_get_boolean (variant) ? "true" : "false";
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING))
value = g_variant_get_string (variant, NULL); value = g_variant_get_string (variant, NULL);
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_BYTESTRING))
value = g_variant_get_bytestring (variant);
else else
continue; continue;