Merge lp:~kamstrup/zeitgeist/network-manager-state-fix into lp:zeitgeist/0.1

[Mikkel Kamstrup Erlandsen]

See linked bug. Updates to be compatible with NM API version <0.9 and >=0.9

[Siegfried Gevatter (rainct)]

What about something like this?

 NM_CONNECTED_STATES = (3, 70)
 if state in NMNetworkMonitor.NM_CONNECTED_STATES

Anyway, looks fine.

review: Approve

=== modified file '_zeitgeist/engine/extensions/storagemonitor.py'
--- _zeitgeist/engine/extensions/storagemonitor.py	2011-03-11 14:18:47 +0000
+++ _zeitgeist/engine/extensions/storagemonitor.py	2011-09-05 12:13:00 +0000
@@ -303,11 +303,9 @@
 	NM_IFACE = "org.freedesktop.NetworkManager"
 	NM_OBJECT_PATH = "/org/freedesktop/NetworkManager"
 	
-	NM_STATE_UNKNOWN = 0
-	NM_STATE_ASLEEP = 1
-	NM_STATE_CONNECTING = 2
-	NM_STATE_CONNECTED = 3
-	NM_STATE_DISCONNECTED = 4
+	# NM 0.9 broke API so we have to check for two possible values for the state
+	NM_STATE_CONNECTED_PRE_09 = 3
+	NM_STATE_CONNECTED_POST_09 = 70
 	
 	def __init__ (self, on_network_up, on_network_down):
 		log.debug("Creating NetworkManager network monitor")
@@ -335,7 +333,7 @@
 		
 	def _on_state_changed(self, state):
 		log.debug("NetworkManager network state: %s" % state)
-		if state == NMNetworkMonitor.NM_STATE_CONNECTED:
+		if state == NMNetworkMonitor.NM_STATE_CONNECTED_PRE_09 or state == NMNetworkMonitor.NM_STATE_CONNECTED_POST_09:
 			self._up ()
 		else:
 			self._down()