fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 02:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: NM_SETTING_WIRED_S390_SUBCHANNELS is now G_TYPE_STRV (rh #1168764)

Browse source 
Fixes crash on s390.
The type change of the property was done in 6a4127cfa0,
but we forgot to update this function.

https://bugzilla.redhat.com/show_bug.cgi?id=1168764
This commit is contained in:
Jiří Klimeš 2014-11-28 12:15:23 +01:00
parent 4bf04700bb
commit 313a4081b5
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/devices/nm-device-ethernet.c
View file

@ -1536,15 +1536,14 @@ update_connection (NMDevice *device, NMConnection *connection)
/* s390 */
if (priv->subchannels) {
GPtrArray *subchan_arr = g_ptr_array_sized_new (3);
if (priv->subchan1)
g_ptr_array_add (subchan_arr, priv->subchan1);
if (priv->subchan2)
g_ptr_array_add (subchan_arr, priv->subchan2);
if (priv->subchan3)
g_ptr_array_add (subchan_arr, priv->subchan3);
g_object_set (s_wired, NM_SETTING_WIRED_S390_SUBCHANNELS, subchan_arr, NULL);
g_ptr_array_free (subchan_arr, TRUE);
char **subchannels = g_new (char *, 3 + 1);
subchannels[0] = g_strdup (priv->subchan1);
subchannels[1] = g_strdup (priv->subchan2);
subchannels[2] = g_strdup (priv->subchan3);
subchannels[3] = NULL;
g_object_set (s_wired, NM_SETTING_WIRED_S390_SUBCHANNELS, subchannels, NULL);
g_strfreev (subchannels);
}
if (priv->s390_nettype)
g_object_set (s_wired, NM_SETTING_WIRED_S390_NETTYPE, priv->s390_nettype, NULL);