diff options
| author | Dan Winship <danw@gnome.org> | 2014-08-28 11:23:25 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-09-03 11:13:19 -0400 |
| commit | 99bde21a951c3e9a9b4fcbc65d25569b3f97b562 (patch) | |
| tree | 98764210b43a585e1bef59268d4aaa2bf02e0511 | |
| parent | e2126fb5187a851c6e6147362288d2cbbc517a47 (diff) | |
| download | NetworkManager-99bde21a951c3e9a9b4fcbc65d25569b3f97b562.tar.gz | |
fixup! libnm-core: change map-of-string properties to G_TYPE_HASH_TABLE
| -rw-r--r-- | libnm-core/nm-value-transforms.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libnm-core/nm-value-transforms.c b/libnm-core/nm-value-transforms.c index 2631a9d651..de73d9b44e 100644 --- a/libnm-core/nm-value-transforms.c +++ b/libnm-core/nm-value-transforms.c @@ -174,33 +174,6 @@ _nm_utils_convert_gvalue_hash_to_string (const GValue *src_value, GValue *dest_v } static void -convert_one_string_hash_entry (gpointer key, gpointer value, gpointer user_data) -{ - GString *printable = (GString *) user_data; - - if (printable->len) - g_string_append_c (printable, ','); - g_string_append_printf (printable, "%s=%s", (const char *) key, (const char *) value); -} - -static void -_nm_utils_convert_string_hash_to_string (const GValue *src_value, GValue *dest_value) -{ - GHashTable *hash; - GString *printable; - - g_return_if_fail (g_type_is_a (G_VALUE_TYPE (src_value), DBUS_TYPE_G_MAP_OF_STRING)); - - hash = (GHashTable *) g_value_get_boxed (src_value); - - printable = g_string_new (NULL); - if (hash) - g_hash_table_foreach (hash, convert_one_string_hash_entry, printable); - - g_value_take_string (dest_value, g_string_free (printable, FALSE)); -} - -static void _nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_value) { GArray *array; @@ -470,9 +443,6 @@ _nm_value_transforms_register (void) g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_STRING, _nm_utils_convert_gvalue_hash_to_string); - g_value_register_transform_func (DBUS_TYPE_G_MAP_OF_STRING, - G_TYPE_STRING, - _nm_utils_convert_string_hash_to_string); g_value_register_transform_func (DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_STRING, _nm_utils_convert_byte_array_to_string); |