Merge lp:~laney/ubiquity/1572793 into lp:ubiquity

[Iain Lane]

misc.py: Ask for the 'State' property instead of 'state'. Fixes display of wireless page. (LP: #1572793)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good!

review: Approve

[Iain Lane (laney)]

BTW for future people - this was because NM ported from dbus-glib to GDBus between wily and xenial, and dbus-glib has a misfeature where it will return the value if you miscapitalise the first letter of a property, instead of erroring. GDBus doesn't do that, so the misspelling of 'State' as 'state' was correctly causing a check in the wireless page to fail, which took an error path that made Ubiquity not load the page.

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-20 16:14:44 +0000
+++ debian/changelog	2016-04-21 15:21:58 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.21.64) UNRELEASED; urgency=medium
+
+  * misc.py: Ask for the 'State' property instead of 'state'. Fixes display
+    of wireless page. (LP: #1572793)
+
+ -- Iain Lane <[e-mail]>  Thu, 21 Apr 2016 16:05:15 +0100
+
 ubiquity (2.21.63) xenial; urgency=medium
 
   * Automatic update of included source packages: user-setup
 
=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py	2014-11-26 00:12:18 +0000
+++ ubiquity/misc.py	2016-04-21 15:21:58 +0000
@@ -824,7 +824,7 @@
     import dbus
     bus = dbus.SystemBus()
     manager = bus.get_object(NM, '/org/freedesktop/NetworkManager')
-    state = get_prop(manager, NM, 'state')
+    state = get_prop(manager, NM, 'State')
     return state == NM_STATE_CONNECTED_GLOBAL