Auto-merge for PR #114 via VersionBot

NetworkManager::get_state uses incorrect D-Bus type
balena-io-modules · Mar 6, 2018 · a2936ba · a2936ba
2 parents 10e75ab + f683c78
commit a2936ba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v0.9.1 - 2018-03-06
+
+* NetworkManager::get_state uses incorrect D-Bus type #114 [majorz]
+
 ## v0.9.0 - 2018-02-15
 
 * Error handling with error-chain #110 [majorz]

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "network-manager"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Zahari Petkov <[email protected]>", "Aaron Brodersen <[email protected]>"]
 description = "Rust NetworkManager bindings"
 homepage = "https://github.com/resin-io-modules/network-manager"

diff --git a/src/dbus_nm.rs b/src/dbus_nm.rs
@@ -54,7 +54,7 @@ impl DBusNetworkManager {
         let response = self.dbus
             .call(NM_SERVICE_PATH, NM_SERVICE_INTERFACE, "state")?;
 
-        let state: i64 = self.dbus.extract(&response)?;
+        let state: u32 = self.dbus.extract(&response)?;
 
         Ok(NetworkManagerState::from(state))
     }

diff --git a/src/manager.rs b/src/manager.rs
@@ -134,8 +134,8 @@ pub enum NetworkManagerState {
     ConnectedGlobal,
 }
 
-impl From<i64> for NetworkManagerState {
-    fn from(state: i64) -> Self {
+impl From<u32> for NetworkManagerState {
+    fn from(state: u32) -> Self {
         match state {
             0 => NetworkManagerState::Unknown,
             10 => NetworkManagerState::Asleep,