Auto-merge for PR #77 via VersionBot

Expose connection type in ConnectionSettings

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.5.0 - 2017-06-15
+
+* Expose connection type in ConnectionSettings [majorz]
+
 ## v0.4.0 - 2017-06-15
 
 * ASCII oriented SSID Debug formatting [majorz]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "network_manager"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Joseph Roberts <[email protected]>", "Zahari Petkov <[email protected]>"]
 
 [dependencies]

src/connection.rs

@@ -161,6 +161,7 @@ impl<'a> From<&'a Connection> for i32 {
 
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct ConnectionSettings {
+    pub kind: String, // `type` is a reserved word, so we are using `kind` instead
     pub id: String,
     pub uuid: String,
     pub ssid: Ssid,

src/dbus_nm.rs

@@ -130,6 +130,7 @@ impl DBusNetworkManager {
 
         let dict: Dict<&str, Dict<&str, Variant<Iter>, _>, _> = self.dbus.extract(&response)?;
 
+        let mut kind = String::new();
         let mut id = String::new();
         let mut uuid = String::new();
         let mut ssid = Ssid::new();
@@ -143,6 +144,9 @@ impl DBusNetworkManager {
                     "uuid" => {
                         uuid = extract::<String>(&mut v2)?;
                     },
+                    "type" => {
+                        kind = extract::<String>(&mut v2)?;
+                    },
                     "ssid" => {
                         ssid = Ssid::from_bytes(variant_iter_to_vec_u8(&mut v2)?)?;
                     },
@@ -152,6 +156,7 @@ impl DBusNetworkManager {
         }
 
         Ok(ConnectionSettings {
+            kind: kind,
             id: id,
             uuid: uuid,
             ssid: ssid,