diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /libnm-util/nm-setting-vlan.c | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'libnm-util/nm-setting-vlan.c')
| -rw-r--r-- | libnm-util/nm-setting-vlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index df7f0702..da1cb7f8 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -407,8 +407,8 @@ nm_setting_vlan_remove_priority (NMSettingVlan *setting, list = get_map (setting, map); g_return_if_fail (idx < g_slist_length (list)); - item = g_slist_nth_data (list, idx); - priority_map_free ((PriorityMap *) item); + item = g_slist_nth (list, idx); + priority_map_free ((PriorityMap *) (item->data)); set_map (setting, map, g_slist_delete_link (list, item)); } @@ -636,6 +636,8 @@ finalize (GObject *object) g_free (priv->parent); nm_utils_slist_free (priv->ingress_priority_map, g_free); nm_utils_slist_free (priv->egress_priority_map, g_free); + + G_OBJECT_CLASS (nm_setting_vlan_parent_class)->finalize (object); } static void |