diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:28:37 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:28:52 -0500 |
| commit | 23b72b08c0e0079ce1c6e6daa5b2a95602290cf3 (patch) | |
| tree | 423b7ab020011c905b18e4706558537d01758b8e /src/libnm-core-impl/nm-connection.c | |
| parent | 54a11b421d2f5e43f9c88eb38a0a5992e9636290 (diff) | |
| parent | dbc388c3d1132f291cf4d62455d77e71d0918dcc (diff) | |
Merge tag 'debian/1.40.4-1' into ubuntu/master
network-manager Debian release 1.40.4-1
Diffstat (limited to 'src/libnm-core-impl/nm-connection.c')
| -rw-r--r-- | src/libnm-core-impl/nm-connection.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index aed4be21..2f5bf357 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -228,8 +228,10 @@ _nm_connection_add_setting(NMConnection *connection, NMSetting *setting) priv = NM_CONNECTION_GET_PRIVATE(connection); s_old = priv->settings[setting_info->meta_type]; - if (s_old == setting) + if (s_old == setting) { + g_object_unref(s_old); return; + } priv->settings[setting_info->meta_type] = setting; @@ -3487,7 +3489,7 @@ nm_connection_get_setting_olpc_mesh(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsBridge if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsBridge * nm_connection_get_setting_ovs_bridge(NMConnection *connection) @@ -3503,7 +3505,7 @@ nm_connection_get_setting_ovs_bridge(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsInterface if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsInterface * nm_connection_get_setting_ovs_interface(NMConnection *connection) @@ -3520,7 +3522,7 @@ nm_connection_get_setting_ovs_interface(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsPatch if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsPatch * nm_connection_get_setting_ovs_patch(NMConnection *connection) @@ -3536,7 +3538,7 @@ nm_connection_get_setting_ovs_patch(NMConnection *connection) * * Returns: (transfer none): an #NMSettingOvsPort if the connection contains one, otherwise %NULL * - * Since: 1.10 + * Since: 1.14 **/ NMSettingOvsPort * nm_connection_get_setting_ovs_port(NMConnection *connection) @@ -3626,7 +3628,7 @@ nm_connection_get_setting_tc_config(NMConnection *connection) * * Returns: (transfer none): an #NMSettingTun if the connection contains one, otherwise %NULL * - * Since: 1.2 + * Since: 1.14 **/ NMSettingTun * nm_connection_get_setting_tun(NMConnection *connection) |