Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

3 files changed, 2 insertions, 6 deletions

diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index eb200679..30284f9e 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/devices/bluetooth/meson.build
@@ -26,7 +26,7 @@ libnm_device_plugin_bluetooth = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_bluetooth
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index cc9e38c8..d8e40d6f 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -494,7 +494,7 @@ nm_bluez_device_disconnect (NMBluezDevice *self)
 	                        priv->path,
 	                        dbus_iface,
 	                        "Disconnect",
-	                        args ? args : g_variant_new ("()"),
+	                        args ?: g_variant_new("()"),
 	                        NULL,
 	                        G_DBUS_CALL_FLAGS_NONE,
 	                        10000,
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 96e80245..c74ecd81 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -125,7 +125,6 @@ async_data_unpack (struct AsyncData *async_data)
 	return self;
 }
 
-
 /**
  * Cancel any current attempt to detect the version and cleanup
  * the related fields.
@@ -145,7 +144,6 @@ cleanup_checking (NMBluezManager *self, gboolean do_unwatch_name)
 	}
 }
 
-
 static void
 manager_bdaddr_added_cb (GObject *manager,
                          NMBluezDevice *bt_device,
@@ -244,7 +242,6 @@ setup_bluez5 (NMBluezManager *self)
 	nm_bluez5_manager_query_devices (manager);
 }
 
-
 static void
 watch_name_on_appeared (GDBusConnection *connection,
                         const gchar *name,
@@ -254,7 +251,6 @@ watch_name_on_appeared (GDBusConnection *connection,
 	check_bluez_and_try_setup (NM_BLUEZ_MANAGER (user_data));
 }
 
-
 static void
 check_bluez_and_try_setup_final_step (NMBluezManager *self, int bluez_version, const char *reason)
 {