Merge lp:~mterry/software-center/network-manager-0.9 into lp:software-center

[Michael Terry]

=== modified file 'softwarecenter/netstatus.py'
--- softwarecenter/netstatus.py	2011-05-18 16:55:32 +0000
+++ softwarecenter/netstatus.py	2011-06-01 13:19:59 +0000
@@ -27,16 +27,38 @@
 # enums
 class NetState(object):
     """ enums for network manager status """
+    # Old enum values are for NM 0.7
+
     # The NetworkManager daemon is in an unknown state. 
-    NM_STATE_UNKNOWN      = 0   
+    NM_STATE_UNKNOWN            = 0   
+    NM_STATE_UNKNOWN_LIST       = [NM_STATE_UNKNOWN]
     # The NetworkManager daemon is asleep and all interfaces managed by it are inactive. 
-    NM_STATE_ASLEEP       = 1
+    NM_STATE_ASLEEP_OLD         = 1
+    NM_STATE_ASLEEP             = 10
+    NM_STATE_ASLEEP_LIST        = [NM_STATE_ASLEEP_OLD,
+                                   NM_STATE_ASLEEP]
     # The NetworkManager daemon is connecting a device.
-    NM_STATE_CONNECTING   = 2
+    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    = 3
+    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 NetworkManager daemon is disconnecting.
+    NM_STATE_DISCONNECTING      = 30
+    NM_STATE_DISCONNECTING_LIST = [NM_STATE_DISCONNECTING]
     # The NetworkManager daemon is disconnected.
-    NM_STATE_DISCONNECTED = 4
+    NM_STATE_DISCONNECTED_OLD   = 4
+    NM_STATE_DISCONNECTED       = 20
+    NM_STATE_DISCONNECTED_LIST  = [NM_STATE_DISCONNECTED_OLD,
+                                   NM_STATE_DISCONNECTED]
 
 
 class NetworkStatusWatcher(gobject.GObject):
@@ -100,8 +122,8 @@
 def network_state_is_connected():
     """ get bool if we are connected """
     # unkown because in doubt, just assume we have network
-    return get_network_state() in (NetState.NM_STATE_UNKNOWN,
-                                   NetState.NM_STATE_CONNECTED)
+    return get_network_state() in NetState.NM_STATE_UNKNOWN_LIST + \
+                                  NetState.NM_STATE_CONNECTED_LIST
 
 # init it once
 __init_network_state()

=== modified file 'softwarecenter/ui/gtk/appdetailsview_gtk.py'
--- softwarecenter/ui/gtk/appdetailsview_gtk.py	2011-05-31 13:36:38 +0000
+++ softwarecenter/ui/gtk/appdetailsview_gtk.py	2011-06-01 13:19:59 +0000
@@ -779,13 +779,13 @@
         return
 
     def _on_net_state_changed(self, watcher, state):
-        if state == NetState.NM_STATE_DISCONNECTED:
+        if state in NetState.NM_STATE_DISCONNECTED_LIST:
             self._check_for_reviews()
-        elif state == NetState.NM_STATE_CONNECTED:
+        elif state in NetState.NM_STATE_CONNECTED_LIST:
             gobject.timeout_add(500, self._check_for_reviews)
 
         # set addon table and action button states based on sensitivity
-        sensitive = state == NetState.NM_STATE_CONNECTED
+        sensitive = state in NetState.NM_STATE_CONNECTED_LIST
         self.pkg_statusbar.button.set_sensitive(sensitive)
         self.addon_view.addons_set_sensitive(sensitive)
         self.addons_statusbar.button_apply.set_sensitive(sensitive)

=== modified file 'softwarecenter/ui/gtk/appview.py'
--- softwarecenter/ui/gtk/appview.py	2011-05-26 23:51:14 +0000
+++ softwarecenter/ui/gtk/appview.py	2011-06-01 13:19:59 +0000
@@ -847,7 +847,7 @@
         #if not action_btn: return False
 
         net_state = get_network_state()
-        if net_state == NetState.NM_STATE_DISCONNECTED:
+        if net_state in NetState.NM_STATE_DISCONNECTED_LIST:
             action_btn.set_sensitive(False)
             return
         elif self.is_action_in_progress_for_selected_app():