diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
| commit | f87c30ac3b55627a166953aec4de552f5a8c5a53 (patch) | |
| tree | 1eb82dba7af28b0504403e2aacaeaf927d14065c /src/devices | |
| parent | bf9fe831a32fc90b956ee777b629adaf6df49d65 (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Update upstream source from tag 'upstream/1.14.4'
Update to upstream version '1.14.4' with Debian dir 3e8398be8782c0495d64cae17094a6b9e5e62907
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/bluetooth/meson.build | 3 | ||||
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/devices/wwan/meson.build | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index 019f04f6..628a3bc8 100644 --- a/src/devices/bluetooth/meson.build +++ b/src/devices/bluetooth/meson.build @@ -26,7 +26,8 @@ libnm_device_plugin_bluetooth = shared_module( link_args: ldflags_linker_script_devices, link_depends: linker_script_devices, install: true, - install_dir: nm_plugindir + install_dir: nm_plugindir, + install_rpath: nm_plugindir ) core_plugins += libnm_device_plugin_bluetooth diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 26ea06bd..f2dbe659 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5486,7 +5486,7 @@ nm_device_generate_connection (NMDevice *self, klass->update_connection (self, connection); - if (!nm_connection_normalize (connection, NULL, NULL, error)) { + if (!nm_connection_normalize (connection, NULL, NULL, &local)) { g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, "generated connection does not verify: %s", local->message); diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build index 2c0ea5a1..5fe6e433 100644 --- a/src/devices/wwan/meson.build +++ b/src/devices/wwan/meson.build @@ -54,7 +54,8 @@ libnm_device_plugin_wwan = shared_module( link_args: ldflags_linker_script_devices, link_depends: linker_script_devices, install: true, - install_dir: nm_plugindir + install_dir: nm_plugindir, + install_rpath: nm_plugindir ) core_plugins += libnm_device_plugin_wwan |