diff options
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-device.c | 2 | ||||
| -rw-r--r-- | libnm/nm-dhcp-config.c | 2 | ||||
| -rw-r--r-- | libnm/nm-manager.c | 2 | ||||
| -rw-r--r-- | libnm/nm-object.c | 2 | ||||
| -rw-r--r-- | libnm/nm-vpn-plugin-old.c | 4 | ||||
| -rw-r--r-- | libnm/nm-vpn-service-plugin.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 65afd078dc..5e4c789394 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2570,7 +2570,7 @@ nm_lldp_neighbor_new (void) neigh = g_new0 (NMLldpNeighbor, 1); neigh->refcount = 1; - neigh->attrs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, + neigh->attrs = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); return neigh; diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c index 3161e2960f..33b99ed04b 100644 --- a/libnm/nm-dhcp-config.c +++ b/libnm/nm-dhcp-config.c @@ -51,7 +51,7 @@ nm_dhcp_config_init (NMDhcpConfig *config) { NMDhcpConfigPrivate *priv = NM_DHCP_CONFIG_GET_PRIVATE (config); - priv->options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + priv->options = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); } static gboolean diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 2f00545d9d..a8752d682d 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -1458,7 +1458,7 @@ checkpoint_rollback_cb (GObject *object, &variant, result, &error)) { - hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + hash = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); g_variant_iter_init (&iter, variant); while (g_variant_iter_next (&iter, "{&su}", &path, &r)) g_hash_table_insert (hash, g_strdup (path), GUINT_TO_POINTER (r)); diff --git a/libnm/nm-object.c b/libnm/nm-object.c index c344a08dca..8297259d40 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -955,7 +955,7 @@ _nm_object_register_properties (NMObject *object, G_CALLBACK (properties_changed), object); g_ptr_array_add (priv->proxies, proxy); - instance = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + instance = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); priv->property_tables = g_slist_prepend (priv->property_tables, instance); for (tmp = (NMPropertiesInfo *) info; tmp->name; tmp++) { diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index 2b5922b925..1892c394b7 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -728,8 +728,8 @@ nm_vpn_plugin_old_read_vpn_details (int fd, if (out_secrets) g_return_val_if_fail (*out_secrets == NULL, FALSE); - data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_secret); + data = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); + secrets = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, free_secret); line = g_string_new (NULL); diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 31e1295488..79bd0f8193 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -750,8 +750,8 @@ nm_vpn_service_plugin_read_vpn_details (int fd, if (out_secrets) g_return_val_if_fail (*out_secrets == NULL, FALSE); - data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_secret); + data = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); + secrets = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, free_secret); line = g_string_new (NULL); |