diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-14 13:14:12 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-14 16:32:15 +0100 |
| commit | b6bbf3df1ee4dfc5bf319bbe9e63b86916bb6ce4 (patch) | |
| tree | 36701e699b50a78baad8f64bf22626e74d208bfd | |
| parent | 5b14492b0b1d2ef5e124a17c20853994c7401135 (diff) | |
| download | NetworkManager-b6bbf3df1ee4dfc5bf319bbe9e63b86916bb6ce4.tar.gz | |
ifupdown: ssid is now GBytes for quite some time
Fixes: c43f88907be66f8f62a8edbe76ae2aec4ff61190
| -rw-r--r-- | src/settings/plugins/ifupdown/parser.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 1eb7170ba8..a58d7712db 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -113,13 +113,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, @@ -131,13 +130,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) { |