Merge branch 'master' of https://github.com/ukui/kylin-nm

debian/changelog

@@ -1,3 +1,11 @@
+kylin-nm (1.2.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Bump standards-version to 4.5.0.
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Tue, 25 Feb 2020 14:12:29 +0800
+
 kylin-nm (1.0.4-1) unstable; urgency=medium
 
   * New upstream release.

debian/control

@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 12),
                qtbase5-dev,
                libnotify-bin,
                libqt5x11extras5-dev (>= 5.11.1-2),
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/ukui/kylin-nm
 Vcs-Git: https://github.com/ukui/kylin-nm.git

kylin-dbus-interface.cpp

@@ -105,8 +105,8 @@ void KylinDBus::getPhysicalCarrierState(int n)
     } else if (reply.value().toString() == "false"){
         isWiredCableOn = false;
     } else {
-        syslog(LOG_ERR, "Error occured when get the property 'Carrier' of Wired");
-        qDebug()<<"Error occured when get the property 'Carrier' of Wired";
+        syslog(LOG_ERR, "Error occurred when get the property 'Carrier' of Wired");
+        qDebug()<<"Error occurred when get the property 'Carrier' of Wired";
     }
 
     if (n == 1){ this->mw->onPhysicalCarrierChanged(isWiredCableOn);}