diff options
| author | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
| commit | 06356c8ac470c1fa46f881b0598ec48a653e69ae (patch) | |
| tree | 42e7714b4caedf4d23ebefd42d8d0afebc6f3569 /src/libnm-core-impl/nm-connection.c | |
| parent | 78ecd0c8a4a337e38470f3fae5db74daf61ba86a (diff) | |
| parent | 372b62c2c25eb1f2e811f84849e9b69c40ae6245 (diff) | |
Merge branch 'debian/master' into debian/bullseye-backports
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) |