diff -Nru network-manager-1.2.2/debian/changelog network-manager-1.2.2/debian/changelog --- network-manager-1.2.2/debian/changelog 2016-08-18 14:42:16.000000000 +0800 +++ network-manager-1.2.2/debian/changelog 2016-08-27 14:13:02.000000000 +0800 @@ -1,3 +1,10 @@ +network-manager (1.2.2-0ubuntu9) yakkety; urgency=medium + + * wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch: + Fix the regression that makes WiFi malfunctioned. (LP: #1585863) + + -- XiaoLe Sat, 27 Aug 2016 14:09:39 +0800 + network-manager (1.2.2-0ubuntu8) yakkety; urgency=medium * network-manager.postinst: Don't create diff -Nru network-manager-1.2.2/debian/patches/wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch network-manager-1.2.2/debian/patches/wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch --- network-manager-1.2.2/debian/patches/wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch 2016-08-18 14:42:16.000000000 +0800 +++ network-manager-1.2.2/debian/patches/wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch 2016-08-27 14:07:21.000000000 +0800 @@ -14,10 +14,10 @@ src/supplicant-manager/nm-supplicant-interface.c | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) -diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml -index c1f378d..82b2742 100644 ---- a/introspection/nm-device-wifi.xml -+++ b/introspection/nm-device-wifi.xml +Index: network-manager-1.2.2/introspection/nm-device-wifi.xml +=================================================================== +--- network-manager-1.2.2.orig/introspection/nm-device-wifi.xml 2016-04-25 22:46:58.000000000 +0800 ++++ network-manager-1.2.2/introspection/nm-device-wifi.xml 2016-08-04 18:25:26.000000000 +0800 @@ -120,5 +120,12 @@ @@ -31,11 +31,11 @@ + -diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c -index a6acd37..bacd5e6 100644 ---- a/src/devices/wifi/nm-device-wifi.c -+++ b/src/devices/wifi/nm-device-wifi.c -@@ -84,6 +84,7 @@ enum { +Index: network-manager-1.2.2/src/devices/wifi/nm-device-wifi.c +=================================================================== +--- network-manager-1.2.2.orig/src/devices/wifi/nm-device-wifi.c 2016-08-04 18:25:26.000000000 +0800 ++++ network-manager-1.2.2/src/devices/wifi/nm-device-wifi.c 2016-08-04 18:25:26.000000000 +0800 +@@ -84,6 +84,7 @@ ACCESS_POINT_ADDED, ACCESS_POINT_REMOVED, SCANNING_ALLOWED, @@ -43,7 +43,7 @@ LAST_SIGNAL }; -@@ -1363,6 +1364,7 @@ supplicant_iface_scan_done_cb (NMSupplicantInterface *iface, +@@ -1363,6 +1364,7 @@ _LOGD (LOGD_WIFI_SCAN, "scan %s", success ? "successful" : "failed"); @@ -51,7 +51,7 @@ priv->last_scan = nm_utils_get_monotonic_timestamp_s (); schedule_scan (self, success); -@@ -3082,6 +3084,14 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass) +@@ -3082,6 +3084,14 @@ scanning_allowed_accumulator, NULL, NULL, G_TYPE_BOOLEAN, 0); @@ -66,11 +66,11 @@ nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass), NMDBUS_TYPE_DEVICE_WIFI_SKELETON, "GetAccessPoints", impl_device_wifi_get_access_points, -diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h -index 7e0d06f..6efb96b 100644 ---- a/src/devices/wifi/nm-device-wifi.h -+++ b/src/devices/wifi/nm-device-wifi.h -@@ -68,6 +68,7 @@ struct _NMDeviceWifiClass +Index: network-manager-1.2.2/src/devices/wifi/nm-device-wifi.h +=================================================================== +--- network-manager-1.2.2.orig/src/devices/wifi/nm-device-wifi.h 2016-04-25 22:46:58.000000000 +0800 ++++ network-manager-1.2.2/src/devices/wifi/nm-device-wifi.h 2016-08-04 18:25:26.000000000 +0800 +@@ -68,6 +68,7 @@ void (*access_point_added) (NMDeviceWifi *device, NMAccessPoint *ap); void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap); gboolean (*scanning_allowed) (NMDeviceWifi *device); @@ -78,17 +78,3 @@ }; -diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c -index ce7a2a2..f963ee7 100644 ---- a/src/supplicant-manager/nm-supplicant-interface.c -+++ b/src/supplicant-manager/nm-supplicant-interface.c -@@ -1334,8 +1334,8 @@ scan_request_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) - g_dbus_error_strip_remote_error (error); - _LOGW ("could not get scan request result: %s", error->message); - } -+ g_signal_emit (self, signals[SCAN_DONE], 0, FALSE); - } -- g_signal_emit (self, signals[SCAN_DONE], 0, error ? FALSE : TRUE); - } - - gboolean