Merge lp:~wenchien/ubuntu/precise/ubiquity/lp883615 into lp:~ubuntu-installer/ubiquity/precise-proposed

[Jesse Sung]

[Colin Watson (cjwatson)]

Looks good, thanks. I'll clean up a few changelog and style issues (e.g. you mustn't refer to private bugs in public changelogs), and apply this to the development branch as well.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-01 01:38:44 +0000
+++ debian/changelog	2012-12-03 09:39:21 +0000
@@ -1,3 +1,11 @@
+ubiquity (2.10.23) precise-proposed; urgency=low
+
+  [ Jesse Sung ]
+  * Fix multiple issues for Back/Stop and Continue/Connect buttons.
+    (LP: #883615) (LP: #1060229)
+
+ -- Jesse Sung <[e-mail]>  Mon, 03 Dec 2012 17:18:29 +0800
+
 ubiquity (2.10.22) precise-proposed; urgency=low
 
   [ Dmitrijs Ledkovs ]

=== modified file 'ubiquity/nm.py'
--- ubiquity/nm.py	2012-06-27 22:01:35 +0000
+++ ubiquity/nm.py	2012-12-03 09:39:21 +0000
@@ -73,6 +73,8 @@
         self.timeout_id = 0
         self.start(state_changed)
         self.active_connection = None
+        self.active_device_obj = None
+        self.active_conn = None
 
     def start(self, state_changed=None):
         self.bus = dbus.SystemBus()
@@ -124,12 +126,21 @@
         obj = dbus.Dictionary(signature='sa{sv}')
         if passphrase:
             obj['802-11-wireless-security'] = { 'psk' : passphrase }
-        self.active_connection = self.manager.AddAndActivateConnection(
-            obj, dbus.ObjectPath(device), dbus.ObjectPath(saved_path))[1]
+        self.active_conn, self.active_connection = self.manager.AddAndActivateConnection(
+            obj, dbus.ObjectPath(device), dbus.ObjectPath(saved_path))
+        self.active_device_obj = device_obj
 
     def disconnect_from_ap(self):
         if self.active_connection is not None:
             self.manager.DeactivateConnection(self.active_connection)
+            self.active_connection = None
+        if self.active_device_obj is not None:
+            self.active_device_obj.Disconnect()
+            self.active_device_obj = None
+        if self.active_conn is not None:
+            conn_obj = self.bus.get_object(NM, self.active_conn)
+            conn_obj.Delete()
+            self.active_conn = None
 
     def build_passphrase_cache(self):
         self.passphrases_cache = {}

=== modified file 'ubiquity/plugins/ubi-wireless.py'
--- ubiquity/plugins/ubi-wireless.py	2012-06-27 22:01:35 +0000
+++ ubiquity/plugins/ubi-wireless.py	2012-12-03 09:39:21 +0000
@@ -52,6 +52,7 @@
         self.nmwidget.connect('connection', self.state_changed)
         self.nmwidget.connect('selection_changed', self.selection_changed)
         self.nmwidget.connect('pw_validated', self.pw_validated)
+        self.no_wireless = builder.get_object('no_wireless')
         self.use_wireless = builder.get_object('use_wireless')
         self.use_wireless.connect('toggled', self.wireless_toggled)
         self.plugin_widgets = self.page
@@ -128,6 +129,7 @@
             frontend.connecting_spinner.hide()
             frontend.connecting_spinner.stop()
             frontend.connecting_label.hide()
+            self.no_wireless.set_active(True)
             return False
 
     def plugin_on_next_clicked(self):
@@ -154,7 +156,7 @@
             self.controller.allow_go_forward(True)
 
             frontend.translate_widget(frontend.back)
-            self.back_normal = False
+            self.back_normal = True
             frontend.back.set_sensitive(True)
         else:
             frontend.connecting_spinner.show()