Merge lp:~franciscoda/docky/nm-1.0.7-docky-fix into lp:docky

[Francisco]

Fixed Network Manager plugin. Tested on NetworkManager 1.0.7
Added disconnect option for active connections by clicking on them

Most files in StandardPlugins/NetworkManager affected

Unmerged revisions

1866. By Francisco on 2015-10-27

fixes network manager plugin. working for networkmanager 1.0.7
adds disconnect option

=== modified file 'Docky.Services/Docky.Services/SystemService.cs'
--- Docky.Services/Docky.Services/SystemService.cs	2014-05-06 18:12:14 +0000
+++ Docky.Services/Docky.Services/SystemService.cs	2015-10-27 09:11:09 +0000
@@ -117,7 +117,9 @@
 			
 			if (Bus.System.NameHasOwner (NetworkManagerName)) {
 				try {
-					network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, new ObjectPath (NetworkManagerPath));
+					ObjectPath op = new ObjectPath (NetworkManagerPath);
+					network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, op);
+					networkProperties = Bus.System.GetObject<org.freedesktop.DBus.Properties> (NetworkManagerName, op);
 					var state = State;
 					NetworkConnected = (state == NetworkState.ConnectedGlobal || state == NetworkState.ConnectedLocal
 					                    || state == NetworkState.ConnectedSite);
@@ -142,15 +144,16 @@
 		
 		const string NetworkManagerName = "org.freedesktop.NetworkManager";
 		const string NetworkManagerPath = "/org/freedesktop/NetworkManager";
+		org.freedesktop.DBus.Properties networkProperties;
 		INetworkManager network;
 		
 		[Interface(NetworkManagerName)]
-		interface INetworkManager : org.freedesktop.DBus.Properties
+		public interface INetworkManager
 		{
 			event StateChangedHandler StateChanged;
 		}
 		
-		delegate void StateChangedHandler (uint state);
+		public delegate void StateChangedHandler (uint state);
 		
 		public bool NetworkConnected { get; private set; }
 		
@@ -175,7 +178,7 @@
 		NetworkState State {
 			get {
 				try {
-					return (NetworkState) Enum.ToObject (typeof(NetworkState), network.Get (NetworkManagerName, "State"));
+					return (NetworkState) Enum.ToObject (typeof(NetworkState), networkProperties.Get (NetworkManagerName, "State"));
 				} catch (Exception) {
 					return NetworkState.Unknown;
 				}
 
=== modified file 'StandardPlugins/NetworkManager/src/ConnectionManager.cs'
--- StandardPlugins/NetworkManager/src/ConnectionManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/ConnectionManager.cs	2015-10-27 09:11:09 +0000
@@ -29,18 +29,13 @@
 {
 	public class ConnectionManager
 	{
-		const string SettingsObjectPath = "/org/freedesktop/NetworkManagerSettings";
-		const string SystemBus = "org.freedesktop.NetworkManagerSystemSettings";
-		const string UserBus = "org.freedesktop.NetworkManagerUserSettings";
+		const string SettingsObjectPath = "/org/freedesktop/NetworkManager/Settings";
+		const string SystemBus = "org.freedesktop.NetworkManager";
 		
 		public ConnectionManager()
 		{
 			SystemConnectionManager = new DBusObject<IConnectionManager> (SystemBus,  SettingsObjectPath);
-			//SystemConnectionManager.BusObject.NewConnection += OnConnectionAdded;
-			UserConnectionManager = new DBusObject<IConnectionManager> (UserBus,  SettingsObjectPath);
-			//UserConnectionManager.BusObject.NewConnection += OnConnectionAdded;
 			
-			UserConnections = new List<NetworkConnection> ();
 			SystemConnections = new List<NetworkConnection> ();
 			
 			UpdateConnections ();
@@ -49,11 +44,9 @@
 		}
 		
 		DBusObject<IConnectionManager> SystemConnectionManager { get; set; }
-		DBusObject<IConnectionManager> UserConnectionManager { get; set; }
-		public List<NetworkConnection> UserConnections { get; private set; }
 		public List<NetworkConnection> SystemConnections { get; private set; }
 		public IEnumerable<NetworkConnection> AllConnections {
-			get { return UserConnections.Union (SystemConnections); }
+			get { return SystemConnections; }
 		}
 	
 		
@@ -92,28 +85,7 @@
 					Log<ConnectionManager>.Debug (e.StackTrace);
 				}
 			}
-			
-			lock (UserConnections) {
-				UserConnections.Clear ();
-				try {
-					foreach (string con in UserConnectionManager.BusObject.ListConnections ())
-					{
-						NetworkConnection connection = new NetworkConnection (UserBus, con, ConnectionOwner.User);
-						if (connection.Settings.ContainsKey ("802-11-wireless"))
-							connection = new WirelessConnection (UserBus, con, ConnectionOwner.User);
-						else if (connection.Settings.ContainsKey ("802-3-ethernet"))
-							connection = new WiredConnection (UserBus, con, ConnectionOwner.User);
-						else 
-							continue;
-						
-						//connection.ConnectionRemoved += OnNetworkConnectionRemoved;
-						UserConnections.Add (connection);
-					}
-				} catch (Exception e) {
-					Log<ConnectionManager>.Error (e.Message);
-					Log<ConnectionManager>.Debug (e.StackTrace);
-				}
-			}
+
 		}
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/DBusObject.cs'
--- StandardPlugins/NetworkManager/src/DBusObject.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/DBusObject.cs	2015-10-27 09:11:09 +0000
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using DBus;
 using org.freedesktop.DBus;
@@ -27,6 +28,7 @@
 {
 	public class DBusObject<T>
 	{
+		private org.freedesktop.DBus.Properties PropGetter;
 		public string BusName { get; private set; }
 		public string ObjectPath { get; private set; }
 		public T BusObject { get; private set; }
@@ -35,13 +37,27 @@
 		{
 			this.ObjectPath = objectPath;
 			this.BusName = busName;
-			
+
+			ObjectPath op = new ObjectPath(this.ObjectPath);
 			try {
-				this.BusObject = Bus.System.GetObject<T> (BusName, new ObjectPath (ObjectPath));
+				this.BusObject = Bus.System.GetObject<T> (BusName, op);
+				if (this.BusObject == null)
+					throw new Exception ("Bus.System.GetObject returned null for arguments: " + busName + "," + objectPath);
 			} catch (Exception e) {
 				Log<DBusObject<T>>.Error (e.Message);
 				Log<DBusObject<T>>.Debug (e.StackTrace);
 			}
+			this.PropGetter = Bus.System.GetObject<org.freedesktop.DBus.Properties>(this.BusName, op);
+		}
+		public object Get (string propertyName)
+		{
+			return this.PropGetter.Get (
+				typeof (T).GetCustomAttributes(typeof (InterfaceAttribute), true)
+					.Cast<InterfaceAttribute> ()
+					.Select (i => i.Name)
+					.FirstOrDefault(),
+				propertyName
+			);
 		}
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/DeviceManager.cs'
--- StandardPlugins/NetworkManager/src/DeviceManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/DeviceManager.cs	2015-10-27 09:11:09 +0000
@@ -27,7 +27,7 @@
 	{
 		public IEnumerable<string> ActiveConnections {
 			get {
-				foreach (ObjectPath conPath in (ObjectPath[]) BusObject.Get (BusName, "ActiveConnections"))
+				foreach (ObjectPath conPath in (ObjectPath[]) this.Get ("ActiveConnections"))
 					yield return conPath.ToString ();
 			}
 		}
 
=== modified file 'StandardPlugins/NetworkManager/src/Enums.cs'
--- StandardPlugins/NetworkManager/src/Enums.cs	2009-11-25 15:37:53 +0000
+++ StandardPlugins/NetworkManager/src/Enums.cs	2015-10-27 09:11:09 +0000
@@ -27,15 +27,18 @@
 		
 	public enum DeviceState {
 		Unknown = 0,
-		Unmanaged,
-		Unavailable,
-		Disconnected,
-		Preparing,
-		Configuring,
-		NeedsAuth,
-		IPConfiguring,
-		Active,
-		Failed
+		Unmanaged = 10,
+		Unavailable = 20,
+		Disconnected = 30,
+		Preparing = 40,
+		Configuring = 50,
+		NeedsAuth = 60,
+		IPConfiguring = 70,
+		IPChecking = 80,
+		Secondaries = 90,
+		Active = 100,
+		Deactivating = 110,
+		Failed = 120
 	}
 
 	public enum ConnectionOwner {
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IAccessPoint.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.AccessPoint")]
-	public interface IAccessPoint : org.freedesktop.DBus.Properties
+	public interface IAccessPoint
 	{
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IActiveConnection.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.Connection.Active")]
-	public interface IActiveConnection : org.freedesktop.DBus.Properties
+	public interface IActiveConnection
 	{
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IConnectionManager.cs	2015-10-27 09:11:09 +0000
@@ -24,7 +24,7 @@
 {
 	public delegate void ConnectionAddedHandler (string objectPath);
 	
-	[Interface ("org.freedesktop.NetworkManagerSettings")]
+	[Interface ("org.freedesktop.NetworkManager.Settings")]
 	public interface IConnectionManager
 	{
 		string[] ListConnections ();
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IDHCP4Config.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.DHCP4Config")]
-	public interface IDHCP4Config : org.freedesktop.DBus.Properties
+	public interface IDHCP4Config
 	{
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IIP4Config.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.IP4Config")]
-	public interface IIP4Config : org.freedesktop.DBus.Properties
+	public interface IIP4Config
 	{
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/INetManager.cs	2015-10-27 09:11:09 +0000
@@ -23,10 +23,11 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager")]
-	public interface INetManager : org.freedesktop.DBus.Properties
+	public interface INetManager
 	{
 		ObjectPath[] GetDevices ();
-		ObjectPath ActivateConnection (string serviceName, ObjectPath connection, ObjectPath device, ObjectPath specificObject);
+		ObjectPath ActivateConnection (ObjectPath connection, ObjectPath device, ObjectPath specificObject);
+		void DeactivateConnection (ObjectPath active_connection);
 		uint state ();
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/INetworkConnection.cs	2015-10-27 09:11:09 +0000
@@ -23,10 +23,10 @@
 
 namespace NetworkManagerDocklet
 {
-	[Interface("org.freedesktop.NetworkManagerSettings.Connection")]
+	[Interface("org.freedesktop.NetworkManager.Settings.Connection")]
 	public interface INetworkConnection 
 	{
-		IDictionary<string, IDictionary<string, object>> GetSettings();
+		Dictionary<string, Dictionary<string, object>> GetSettings();
 		event ConnectionRemovedHandler Removed;
 	}
 			
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/INetworkDevice.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.Device")]
-	public interface INetworkDevice : org.freedesktop.DBus.Properties
+	public interface INetworkDevice
 	{
 		event StateChangedHandler StateChanged;
 	}
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IWiredDevice.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.Device.Wired")]
-	public interface IWiredDevice : org.freedesktop.DBus.Properties
+	public interface IWiredDevice
 	{
 	}
 }
 
=== modified file 'StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs'
--- StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/Interfaces/IWirelessDevice.cs	2015-10-27 09:11:09 +0000
@@ -23,7 +23,7 @@
 namespace NetworkManagerDocklet
 {
 	[Interface ("org.freedesktop.NetworkManager.Device.Wireless")]
-	public interface IWirelessDevice : org.freedesktop.DBus.Properties
+	public interface IWirelessDevice
 	{
 		ObjectPath[] GetAccessPoints ();
 		event AccessPointAddRemoveHandler AccessPointAdded;
 
=== modified file 'StandardPlugins/NetworkManager/src/NetworkConnection.cs'
--- StandardPlugins/NetworkManager/src/NetworkConnection.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/NetworkConnection.cs	2015-10-27 09:11:09 +0000
@@ -41,11 +41,11 @@
 		
 		public ConnectionOwner Owner { get; private set; }
 		
-		public IDictionary<string, IDictionary<string, object>> Settings {
+		public Dictionary<string, Dictionary<string, object>> Settings {
 			get { return BusObject.GetSettings (); }
 		}
 		
-		private IDictionary<string, object> Connection {
+		private Dictionary<string, object> Connection {
 			get { return this.Settings["connection"]; }
 		}
 		
 
=== modified file 'StandardPlugins/NetworkManager/src/NetworkDevice.cs'
--- StandardPlugins/NetworkManager/src/NetworkDevice.cs	2011-01-09 18:02:06 +0000
+++ StandardPlugins/NetworkManager/src/NetworkDevice.cs	2015-10-27 09:11:09 +0000
@@ -63,7 +63,7 @@
 		public DeviceType DType {
 			get { 
 				try {
-					return (DeviceType) Enum.ToObject (typeof (DeviceType), BusObject.Get (BusName, "DeviceType"));
+					return (DeviceType) Enum.ToObject (typeof (DeviceType), this.Get ("DeviceType"));
 				} catch (Exception e) {
 					Log<NetworkDevice>.Error (e.Message);
 					Log<NetworkDevice>.Debug (e.StackTrace);
@@ -75,7 +75,7 @@
 		public DeviceState State {
 			get	{ 
 				try {
-					return (DeviceState) Enum.ToObject (typeof (DeviceState), BusObject.Get (BusName, "State")); 
+					return (DeviceState) Enum.ToObject (typeof (DeviceState), this.Get ("State")); 
 				} catch (Exception e) {
 					Log<NetworkDevice>.Error (e.Message);
 					Log<NetworkDevice>.Debug (e.StackTrace);
@@ -93,16 +93,16 @@
 		void SetIPs ()
 		{
 			if (State == DeviceState.Active) {
-				if (BusObject.Get (BusName, "Dhcp4Config").ToString () != "/")
+				if (this.Get ("Dhcp4Config").ToString () != "/")
 					ConType = ConnectionType.Manaul;
 				else
 					ConType = ConnectionType.DHCP;
-				IP4Config = new DBusObject<IIP4Config> (NMBusName, BusObject.Get (BusName, "Ip4Config").ToString ());
-				IP4Address = new IPAddress (long.Parse (BusObject.Get (BusName, "Ip4Address").ToString ()));
-				uint[][] Addresses = (uint[][]) IP4Config.BusObject.Get (IP4Config.BusName, "Addresses");
+				IP4Config = new DBusObject<IIP4Config> (NMBusName, this.Get ("Ip4Config").ToString ());
+				IP4Address = new IPAddress (long.Parse (this.Get ("Ip4Address").ToString ()));
+				uint[][] Addresses = (uint[][]) IP4Config.Get ("Addresses");
 				Gateway = new IPAddress (Addresses[0][2]);
 				SubnetMask = ConvertPrefixToIp ((int) Addresses[0][1]);
-				uint[] NameServers = (uint[]) IP4Config.BusObject.Get (IP4Config.BusName, "Nameservers");
+				uint[] NameServers = (uint[]) IP4Config.Get ("Nameservers");
 				if (NameServers.Length > 0)
 					PrimaryDNS = new IPAddress (NameServers[0]);
 				else
 
=== modified file 'StandardPlugins/NetworkManager/src/NetworkManager.cs'
--- StandardPlugins/NetworkManager/src/NetworkManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/NetworkManager.cs	2015-10-27 09:11:09 +0000
@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 
 using DBus;
+using Docky.Services;
 using org.freedesktop.DBus;
 
 namespace NetworkManagerDocklet
@@ -38,10 +39,7 @@
 			get {
 				foreach (string active in DevManager.ActiveConnections) {
 					DBusObject<IActiveConnection> ActiveConnection = new DBusObject<IActiveConnection> ("org.freedesktop.NetworkManager", active);
-					if (ActiveConnection.BusObject.Get (ActiveConnection.BusName, "ServiceName").ToString ().Contains ("System"))
-						yield return ConManager.SystemConnections.Where (con => con.ObjectPath == ActiveConnection.BusObject.Get (ActiveConnection.BusName, "Connection").ToString ()).First ();
-					else
-						yield return ConManager.UserConnections.Where (con => con.ObjectPath == ActiveConnection.BusObject.Get (ActiveConnection.BusName, "Connection").ToString ()).First ();
+					yield return ConManager.SystemConnections.Where (con => con.ObjectPath == ActiveConnection.Get ("Connection").ToString ()).First ();
 				}
 			}
 		}
@@ -61,9 +59,12 @@
 			try {
 				connection = ConManager.AllConnections.OfType<WirelessConnection> ().Where (con => (con as WirelessConnection).SSID == ap.SSID).First ();
 				ConnectTo (connection);
-			} catch {
+			} catch (Exception e) {
 				// FIXME We're trying to connect to an AP but no connection entry exists.
 				// If we can figure out how to manually create a connection behind the scenes, we can remove this.
+				// FIXME 2: What to do if an exception is thrown because of another reason?
+				Log<NetworkManager>.Error(e.Message);
+				Log<NetworkManager>.Debug(e.StackTrace);
 				Docky.Services.DockServices.System.RunOnThread ( () => {
 					Process.Start ("nm-connection-editor --type=802-11-wireless");
 				});
@@ -86,14 +87,22 @@
 				return;
 			}
 			
-			string serviceName;
-			if (con.Owner == ConnectionOwner.System)
-				serviceName = "org.freedesktop.NetworkManagerSystemSettings";
-			else
-				serviceName = "org.freedesktop.NetworkManagerUserSettings";
+			string serviceName = "org.freedesktop.NetworkManager.Settings";
 			string conStr = con.ObjectPath;
 			
-			DevManager.BusObject.ActivateConnection(serviceName, new ObjectPath (conStr), new ObjectPath (dev.ObjectPath), new ObjectPath (specObj));
+			DevManager.BusObject.ActivateConnection(new ObjectPath (conStr), new ObjectPath (dev.ObjectPath), new ObjectPath (specObj));
+		}
+		public void DisconnectFrom (WirelessAccessPoint ap)
+		{
+			ObjectPath apObjectPath = new ObjectPath(ap.ObjectPath);
+			foreach (string active in DevManager.ActiveConnections) {
+				DBusObject<IActiveConnection> activeConnection = new DBusObject<IActiveConnection> ("org.freedesktop.NetworkManager", active);
+				string specificObject = activeConnection.Get("SpecificObject").ToString();
+				if (specificObject == ap.ObjectPath) {
+					DevManager.BusObject.DeactivateConnection(new ObjectPath(activeConnection.ObjectPath));
+					return;
+				}
+			}
 		}
 
 		void OnDevStateChanged(object o, DeviceStateChangedArgs args)
 
=== modified file 'StandardPlugins/NetworkManager/src/NetworkManagerDocklet.cs'
--- StandardPlugins/NetworkManager/src/NetworkManagerDocklet.cs	2014-04-22 15:12:30 +0000
+++ StandardPlugins/NetworkManager/src/NetworkManagerDocklet.cs	2015-10-27 09:11:09 +0000
@@ -83,7 +83,7 @@
 		string SetDockletIcon ()
 		{
 			try {
-				// currently connecting (animated)
+				// currently connecting/disconnecting (animated)
 				NetworkDevice dev = NM.DevManager.NetworkDevices
 					.Where (d => d.State == DeviceState.Configuring || d.State == DeviceState.IPConfiguring || d.State == DeviceState.Preparing)
 					.FirstOrDefault ();
@@ -142,7 +142,7 @@
 			List<MenuItem> active = list[MenuListContainer.Header];
 			
 			foreach (WirelessAccessPoint wap in ActiveAccessPoints) {
-				active.Add (MakeConEntry (wap));
+				active.Add (MakeConEntry (wap, true));
 			}
 			
 			int count = 0;
@@ -156,7 +156,7 @@
 						if (val.Any (wap => ActiveAccessPoints.Contains (wap)))
 							continue;
 						
-						wifi.Add (MakeConEntry (val.OrderByDescending (wap => wap.Strength).First ()));
+						wifi.Add (MakeConEntry (val.OrderByDescending (wap => wap.Strength).First (), false));
 						count++;
 					}
 				}
@@ -200,7 +200,7 @@
 //			//yield return new SimpleMenuButtonArgs (() => Console.WriteLine ("asdf"),"Click me!", "network-manager");
 //		}
 		
-		MenuItem MakeConEntry (WirelessAccessPoint ap)
+		MenuItem MakeConEntry (WirelessAccessPoint ap, bool isactive)
 		{
 			string apName = ap.SSID;
 			string icon = APIconFromStrength (ap.Strength);
@@ -208,7 +208,12 @@
 			
 			bool secure = ap.Flags == APFlags.Privacy || ap.RsnFlags != AccessPointSecurity.None || ap.WpaFlags != AccessPointSecurity.None;
 			
-			Docky.Menus.MenuItem item = new Docky.Menus.MenuItem (apName, icon, (o, a) => NM.ConnectTo (ap));
+			Docky.Menus.MenuItem item;
+			if (isactive) {
+				item = new Docky.Menus.MenuItem (apName, icon, (o, a) => NM.DisconnectFrom(ap));
+			} else {
+				item = new Docky.Menus.MenuItem (apName, icon, (o, a) => NM.ConnectTo (ap));
+			}
 			item.Bold = bold;
 			
 			if (secure)
 
=== modified file 'StandardPlugins/NetworkManager/src/WiredDevice.cs'
--- StandardPlugins/NetworkManager/src/WiredDevice.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/WiredDevice.cs	2015-10-27 09:11:09 +0000
@@ -35,13 +35,13 @@
 		
 		public bool Carrier {
 			get {
-				return Boolean.Parse (WiredProperties.BusObject.Get (WiredProperties.BusName, "Carrier").ToString ());
+				return Boolean.Parse (WiredProperties.Get ("Carrier").ToString ());
 			}
 		}
 		
 		public string HWAddresss {
 			get {
-				return WiredProperties.BusObject.Get (WiredProperties.BusName, "HwAddress").ToString ();
+				return WiredProperties.Get ("HwAddress").ToString ();
 			}
 		}
 	}
 
=== modified file 'StandardPlugins/NetworkManager/src/WirelessAccessPoint.cs'
--- StandardPlugins/NetworkManager/src/WirelessAccessPoint.cs	2009-11-28 23:36:17 +0000
+++ StandardPlugins/NetworkManager/src/WirelessAccessPoint.cs	2015-10-27 09:11:09 +0000
@@ -51,7 +51,7 @@
 		public string SSID {
 			get {
 				try {
-					return System.Text.ASCIIEncoding.ASCII.GetString ((byte[]) BusObject.Get (BusName, "Ssid"));
+					return System.Text.ASCIIEncoding.ASCII.GetString ((byte[]) this.Get ("Ssid"));
 				} catch (Exception e) {
 					Log<WirelessAccessPoint>.Error (ObjectPath);
 					Log<WirelessAccessPoint>.Error (e.Message);
@@ -64,7 +64,7 @@
 		public byte Strength {
 			get {
 				try {
-					return (byte) BusObject.Get (BusName, "Strength");
+					return (byte) this.Get ("Strength");
 				} catch (Exception e) {
 					Log<WirelessAccessPoint>.Error (ObjectPath);
 					Log<WirelessAccessPoint>.Error (e.Message);
@@ -77,7 +77,7 @@
 		public APFlags Flags {
 			get {
 				try {
-					return (APFlags) Convert.ToInt32 (BusObject.Get (BusName, "Flags"));
+					return (APFlags) Convert.ToInt32 (this.Get ("Flags"));
 				} catch (Exception e) {
 					Log<WirelessAccessPoint>.Error (ObjectPath);
 					Log<WirelessAccessPoint>.Error (e.Message);
@@ -90,7 +90,7 @@
 		public AccessPointSecurity RsnFlags {
 			get {
 				try {
-					return (AccessPointSecurity) Convert.ToInt32 (BusObject.Get (BusName, "RsnFlags"));
+					return (AccessPointSecurity) Convert.ToInt32 (this.Get ("RsnFlags"));
 				} catch (Exception e) {
 					Log<WirelessAccessPoint>.Error (ObjectPath);
 					Log<WirelessAccessPoint>.Error (e.Message);
@@ -103,7 +103,7 @@
 		public AccessPointSecurity WpaFlags {
 			get {
 				try {
-					return (AccessPointSecurity) Convert.ToInt32 (BusObject.Get (BusName, "WpaFlags"));
+					return (AccessPointSecurity) Convert.ToInt32 (this.Get ("WpaFlags"));
 				} catch (Exception e) {
 					Log<WirelessAccessPoint>.Error (ObjectPath);
 					Log<WirelessAccessPoint>.Error (e.Message);
 
=== modified file 'StandardPlugins/NetworkManager/src/WirelessConnection.cs'
--- StandardPlugins/NetworkManager/src/WirelessConnection.cs	2009-11-25 15:37:53 +0000
+++ StandardPlugins/NetworkManager/src/WirelessConnection.cs	2015-10-27 09:11:09 +0000
@@ -27,7 +27,7 @@
 		{
 		}
 		
-		public IDictionary<string, object> WirelessProperties {
+		public Dictionary<string, object> WirelessProperties {
 			get { return Settings["802-11-wireless"]; }
 		}
 		
 
=== modified file 'StandardPlugins/NetworkManager/src/WirelessDevice.cs'
--- StandardPlugins/NetworkManager/src/WirelessDevice.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/NetworkManager/src/WirelessDevice.cs	2015-10-27 09:11:09 +0000
@@ -76,7 +76,7 @@
 
 		public WirelessAccessPoint ActiveAccessPoint {
 			get {
-				string access = WirelessProperties.BusObject.Get (WirelessProperties.BusName, "ActiveAccessPoint").ToString ();
+				string access = WirelessProperties.Get ("ActiveAccessPoint").ToString ();
 				return AccessPoints
 					.Where (ap => ap.ObjectPath == access)
 					.DefaultIfEmpty (null)
@@ -85,7 +85,7 @@
 		}
 		
 		public string HWAddress {
-			get { return WirelessProperties.BusObject.Get (WirelessProperties.BusName, "HwAddress").ToString (); }
+			get { return WirelessProperties.Get ("HwAddress").ToString (); }
 		}
 	}
 }