Zeitgeist Framework

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

  1. network-manager-state-fix
  2. Merge into 0.8-python
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 1802
Proposed branch: lp:~kamstrup/zeitgeist/network-manager-state-fix
Merge into: lp:zeitgeist/0.1
Diff against target: 27 lines (+4/-6)
1 file modified
_zeitgeist/engine/extensions/storagemonitor.py (+4/-6)
To merge this branch: bzr merge lp:~kamstrup/zeitgeist/network-manager-state-fix
Reviewer Review Type Date Requested Status
Siegfried Gevatter Approve
Review via email: mp+74089@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Siegfried Gevatter (rainct) wrote :

What about something like this?

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

Anyway, looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
303 NM_IFACE = "org.freedesktop.NetworkManager"303 NM_IFACE = "org.freedesktop.NetworkManager"
304 NM_OBJECT_PATH = "/org/freedesktop/NetworkManager"304 NM_OBJECT_PATH = "/org/freedesktop/NetworkManager"
305 305
306 NM_STATE_UNKNOWN = 0306 # NM 0.9 broke API so we have to check for two possible values for the state
307 NM_STATE_ASLEEP = 1307 NM_STATE_CONNECTED_PRE_09 = 3
308 NM_STATE_CONNECTING = 2308 NM_STATE_CONNECTED_POST_09 = 70
309 NM_STATE_CONNECTED = 3
310 NM_STATE_DISCONNECTED = 4
311 309
312 def __init__ (self, on_network_up, on_network_down):310 def __init__ (self, on_network_up, on_network_down):
313 log.debug("Creating NetworkManager network monitor")311 log.debug("Creating NetworkManager network monitor")
@@ -335,7 +333,7 @@
335 333
336 def _on_state_changed(self, state):334 def _on_state_changed(self, state):
337 log.debug("NetworkManager network state: %s" % state)335 log.debug("NetworkManager network state: %s" % state)
338 if state == NMNetworkMonitor.NM_STATE_CONNECTED:336 if state == NMNetworkMonitor.NM_STATE_CONNECTED_PRE_09 or state == NMNetworkMonitor.NM_STATE_CONNECTED_POST_09:
339 self._up ()337 self._up ()
340 else:338 else:
341 self._down()339 self._down()