Merge lp:~brendan-donegan/update-manager/bug791548_networkmanager0.9 into lp:update-manager

[Brendan Donegan]

Closely based on mterrys changes for software-center, this makes update-manager inter-operate correctly with NetworkManager DBus signals in Oneiric. I redacted the superfluous statuses so as not to pollute the code (ASLEEP, DISCONNECTING, DISCONNECTED).

=== modified file 'UpdateManager/Core/roam.py'
--- UpdateManager/Core/roam.py	2011-03-02 13:28:28 +0000
+++ UpdateManager/Core/roam.py	2011-06-10 13:47:27 +0000
@@ -113,11 +113,24 @@
     NM_DBUS_IFACE = "org.freedesktop.NetworkManager"
 
     # connection states
+    # Old enum values are for NM 0.7
+    
+    # The NetworkManager daemon is in an unknown state.
     NM_STATE_UNKNOWN = 0
-    NM_STATE_ASLEEP = 1
-    NM_STATE_CONNECTING = 2
-    NM_STATE_CONNECTED = 3
-    NM_STATE_DISCONNECTED = 4
+    # The NetworkManager daemon is connecting a device.
+    NM_STATE_CONNECTING_OLD = 2
+    NM_STATE_CONNECTING = 40
+    NM_STATE_CONNECTING_LIST = [NM_STATE_CONNECTING_OLD,
+                                NM_STATE_CONNECTING]
+    # The NetworkManager daemon is connected.
+    NM_STATE_CONNECTED_OLD = 3
+    NM_STATE_CONNECTED_LOCAL = 50
+    NM_STATE_CONNECTED_SITE = 60
+    NM_STATE_CONNECTED_GLOBAL = 70
+    NM_STATE_CONNECTED_LIST = [NM_STATE_CONNECTED_OLD,
+                               NM_STATE_CONNECTED_LOCAL,
+                               NM_STATE_CONNECTED_SITE,
+                               NM_STATE_CONNECTED_GLOBAL]
 
     # The device type is unknown. 
     NM_DEVICE_TYPE_UNKNOWN = 0

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2011-05-02 16:13:29 +0000
+++ UpdateManager/UpdateManager.py	2011-06-10 13:47:27 +0000
@@ -1,4 +1,4 @@
-# UpdateManager.py 
+# UpdateManager.py
 #  
 #  Copyright (c) 2004-2010 Canonical
 #                2004 Michiel Sikkes
@@ -166,7 +166,7 @@
         pass	
 
     def _on_network_alert(self, watcher, state):
-        if state == NetworkManagerHelper.NM_STATE_CONNECTED:
+        if state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST:
             self.connected = True
         else:
             self.connected = False
@@ -834,7 +834,7 @@
   def _on_network_alert(self, watcher, state):
       # do not set the buttons to sensitive/insensitive until NM
       # can deal with dialup connections properly
-      if state == NetworkManagerHelper.NM_STATE_CONNECTING:
+      if state in NetworkManagerHelper.NM_STATE_CONNECTING_LIST:
           self.label_offline.set_text(_("Connecting..."))
           #self.button_reload.set_sensitive(False)
           self.refresh_updates_count()
@@ -842,8 +842,8 @@
           self.vbox_alerts.show()
           self.connected = False
       # in doubt (STATE_UNKNOWN), assume connected
-      elif state in (NetworkManagerHelper.NM_STATE_CONNECTED,
-                     NetworkManagerHelper.NM_STATE_UNKNOWN):
+      elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST or 
+           state == NetworkManagerHelper.NM_STATE_UNKNOWN):
           #self.button_reload.set_sensitive(True)
           self.refresh_updates_count()
           self.hbox_offline.hide()