From 7d1b0fa83523fa41cee5c3544641eb89a8d90473 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 14 Mar 2016 13:14:12 +0100 Subject: [PATCH] ifupdown: ssid is now GBytes for quite some time Fixes: c43f88907be66f8f62a8edbe76ae2aec4ff61190 (cherry picked from commit b6bbf3df1ee4dfc5bf319bbe9e63b86916bb6ce4) --- src/settings/plugins/ifupdown/parser.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 4a7aaf1ca9..e8e3c005d6 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -114,13 +114,12 @@ update_wireless_setting_from_if_block(NMConnection *connection, const gchar* newkey = map_by_mapping(mapping, curr->key+wireless_l); nm_log_info (LOGD_SETTINGS, "wireless setting key: %s='%s'", newkey, curr->data); if(newkey && !strcmp("ssid", newkey)) { - GByteArray *ssid; + GBytes *ssid; gint len = strlen(curr->data); - ssid = g_byte_array_sized_new (len); - g_byte_array_append (ssid, (const guint8 *) curr->data, len); + ssid = g_bytes_new (curr->data, len); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); - g_byte_array_free (ssid, TRUE); + g_bytes_unref (ssid); nm_log_info (LOGD_SETTINGS, "setting wireless ssid = %d", len); } else { g_object_set(wireless_setting, @@ -132,13 +131,12 @@ update_wireless_setting_from_if_block(NMConnection *connection, const gchar* newkey = map_by_mapping(mapping, curr->key+wpa_l); if(newkey && !strcmp("ssid", newkey)) { - GByteArray *ssid; + GBytes *ssid; gint len = strlen(curr->data); - ssid = g_byte_array_sized_new (len); - g_byte_array_append (ssid, (const guint8 *) curr->data, len); + ssid = g_bytes_new (curr->data, len); g_object_set (wireless_setting, NM_SETTING_WIRELESS_SSID, ssid, NULL); - g_byte_array_free (ssid, TRUE); + g_bytes_unref (ssid); nm_log_info (LOGD_SETTINGS, "setting wpa ssid = %d", len); } else if(newkey) {