From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- libnm/meson.build | 2 +- libnm/nm-access-point.c | 2 +- libnm/nm-device-tun.c | 1 + libnm/nm-device.c | 2 +- libnm/nm-manager.c | 16 ++++++++-------- libnm/nm-property-docs.xml | 10 +++++----- libnm/nm-remote-connection.c | 2 +- libnm/nm-settings-docs.xml | 10 +++++----- libnm/nm-wimax-nsp.c | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) (limited to 'libnm') diff --git a/libnm/meson.build b/libnm/meson.build index 62e3e9d7..62e37993 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -184,7 +184,7 @@ pkg.generate( requires: 'gio-2.0', variables: [ 'exec_prefix=${prefix}', - 'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN') + 'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN') ] ) diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 1cac12f9..25281c92 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -367,7 +367,7 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection) * #NMDevice using nm_device_filter_connections() and finally filter that list * with this function. * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @ap. The array should * be freed with g_ptr_array_unref() when it is no longer required. **/ diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c index 2c88bf33..b5721350 100644 --- a/libnm/nm-device-tun.c +++ b/libnm/nm-device-tun.c @@ -268,6 +268,7 @@ finalize (GObject *object) NMDeviceTunPrivate *priv = NM_DEVICE_TUN_GET_PRIVATE (object); g_free (priv->mode); + g_free (priv->hw_address); G_OBJECT_CLASS (nm_device_tun_parent_class)->finalize (object); } diff --git a/libnm/nm-device.c b/libnm/nm-device.c index aa45c4ad..3f1cc636 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2533,7 +2533,7 @@ nm_device_connection_compatible (NMDevice *device, NMConnection *connection, GEr * incompatible with the device. To get the full list of connections see * nm_client_get_connections(). * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @device. The array * should be freed with g_ptr_array_unref() when it is no longer required. **/ diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index aac120c6..e108f2b0 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -885,22 +885,20 @@ activate_info_complete (ActivateInfo *info, NMActiveConnection *active, GError *error) { + nm_clear_g_signal_handler (info->cancellable, &info->cancelled_id); + + c_list_unlink_stale (&info->lst); + if (active) g_simple_async_result_set_op_res_gpointer (info->simple, g_object_ref (active), g_object_unref); else g_simple_async_result_set_from_error (info->simple, error); g_simple_async_result_complete (info->simple); - c_list_unlink_stale (&info->lst); - g_free (info->active_path); g_free (info->new_connection_path); g_object_unref (info->simple); - if (info->cancellable) { - if (info->cancelled_id) - g_signal_handler_disconnect (info->cancellable, info->cancelled_id); - g_object_unref (info->cancellable); - } + nm_g_object_unref (info->cancellable); g_slice_free (ActivateInfo, info); } @@ -1538,7 +1536,7 @@ nm_manager_checkpoint_rollback_finish (NMManager *manager, if (g_simple_async_result_propagate_error (simple, error)) return NULL; else - return g_simple_async_result_get_op_res_gpointer (simple); + return g_hash_table_ref (g_simple_async_result_get_op_res_gpointer (simple)); } static void @@ -1732,6 +1730,8 @@ dispose (GObject *object) priv->all_devices = NULL; } + nm_clear_pointer (&priv->checkpoints, g_ptr_array_unref); + free_active_connections (manager); g_clear_object (&priv->primary_connection); g_clear_object (&priv->activating_connection); diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index 22aed0ea..4016bc07 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -22,7 +22,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -309,8 +309,8 @@ - - + + diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 6c1e0924..08faa77e 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -918,7 +918,7 @@ get_property (GObject *object, guint prop_id, g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->unsaved); break; case PROP_FLAGS: - g_value_set_boolean (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); + g_value_set_uint (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->flags); break; case PROP_FILENAME: g_value_set_string (value, NM_REMOTE_CONNECTION_GET_PRIVATE (object)->filename); diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml index 258d3558..f3dca3fb 100644 --- a/libnm/nm-settings-docs.xml +++ b/libnm/nm-settings-docs.xml @@ -22,7 +22,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -315,8 +315,8 @@ - - + + diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index f8c8ca42..90c2c2bb 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -151,7 +151,7 @@ nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp, NMConnection *connection) * return connections which may be activated with the NSP. Any returned * connections will match the @nsp's network name and other attributes. * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @nsp. The array should * be freed with g_ptr_array_unref() when it is no longer required. **/ -- cgit 1.3.0-6-gf8a5