Merge lp:~cszikszoy/do/nm-connectivity-fix into lp:do

[Chris S.]

[Chris S. (cszikszoy)]

This should fix the cases where people don't have network manaager. What's changed is that we set the connection state if we can find the network manager dbus. If there was an error (the nm dbus wasn't found), we log the error and just assume that we are connected. This way any plugins that query IsConnected won't fail when NM couldn't be found.

[Alex Launi (alexlauni)]

git r done

review: Approve

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs	2009-08-14 00:13:39 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs	2009-10-04 20:10:19 +0000
@@ -53,13 +53,14 @@
 				if (Bus.System.NameHasOwner (NetworkManagerName)) {
 					network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, new ObjectPath (NetworkManagerPath));
 					network.StateChanged += OnStateChanged;
+					SetConnected ();
 				}
 			} catch (Exception e) {
-				Log<NetworkService>.Error ("Could not initialize dbus: {0}", e.Message);
+				// if something bad happened, log the error and assume we are connected
+				Log<NetworkService>.Error ("Could not initialize Network Manager dbus: {0}", e.Message);
 				Log<NetworkService>.Debug (e.StackTrace);
+				this.IsConnected = true;
 			}
-			
-			SetConnected ();
 		}
 
 		void OnStateChanged (uint state)