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

Proposed by Jesse Sung
Status: Merged
Merged at revision: 5426
Proposed branch: lp:~wenchien/ubuntu/precise/ubiquity/lp883615
Merge into: lp:~ubuntu-installer/ubiquity/precise-proposed
Diff against target: 81 lines (+24/-3)
3 files modified
debian/changelog (+8/-0)
ubiquity/nm.py (+13/-2)
ubiquity/plugins/ubi-wireless.py (+3/-1)
To merge this branch: bzr merge lp:~wenchien/ubuntu/precise/ubiquity/lp883615
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+137510@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-01 01:38:44 +0000
3+++ debian/changelog 2012-12-03 09:39:21 +0000
4@@ -1,3 +1,11 @@
5+ubiquity (2.10.23) precise-proposed; urgency=low
6+
7+ [ Jesse Sung ]
8+ * Fix multiple issues for Back/Stop and Continue/Connect buttons.
9+ (LP: #883615) (LP: #1060229)
10+
11+ -- Jesse Sung <jesse.sung@ubuntu.com> Mon, 03 Dec 2012 17:18:29 +0800
12+
13 ubiquity (2.10.22) precise-proposed; urgency=low
14
15 [ Dmitrijs Ledkovs ]
16
17=== modified file 'ubiquity/nm.py'
18--- ubiquity/nm.py 2012-06-27 22:01:35 +0000
19+++ ubiquity/nm.py 2012-12-03 09:39:21 +0000
20@@ -73,6 +73,8 @@
21 self.timeout_id = 0
22 self.start(state_changed)
23 self.active_connection = None
24+ self.active_device_obj = None
25+ self.active_conn = None
26
27 def start(self, state_changed=None):
28 self.bus = dbus.SystemBus()
29@@ -124,12 +126,21 @@
30 obj = dbus.Dictionary(signature='sa{sv}')
31 if passphrase:
32 obj['802-11-wireless-security'] = { 'psk' : passphrase }
33- self.active_connection = self.manager.AddAndActivateConnection(
34- obj, dbus.ObjectPath(device), dbus.ObjectPath(saved_path))[1]
35+ self.active_conn, self.active_connection = self.manager.AddAndActivateConnection(
36+ obj, dbus.ObjectPath(device), dbus.ObjectPath(saved_path))
37+ self.active_device_obj = device_obj
38
39 def disconnect_from_ap(self):
40 if self.active_connection is not None:
41 self.manager.DeactivateConnection(self.active_connection)
42+ self.active_connection = None
43+ if self.active_device_obj is not None:
44+ self.active_device_obj.Disconnect()
45+ self.active_device_obj = None
46+ if self.active_conn is not None:
47+ conn_obj = self.bus.get_object(NM, self.active_conn)
48+ conn_obj.Delete()
49+ self.active_conn = None
50
51 def build_passphrase_cache(self):
52 self.passphrases_cache = {}
53
54=== modified file 'ubiquity/plugins/ubi-wireless.py'
55--- ubiquity/plugins/ubi-wireless.py 2012-06-27 22:01:35 +0000
56+++ ubiquity/plugins/ubi-wireless.py 2012-12-03 09:39:21 +0000
57@@ -52,6 +52,7 @@
58 self.nmwidget.connect('connection', self.state_changed)
59 self.nmwidget.connect('selection_changed', self.selection_changed)
60 self.nmwidget.connect('pw_validated', self.pw_validated)
61+ self.no_wireless = builder.get_object('no_wireless')
62 self.use_wireless = builder.get_object('use_wireless')
63 self.use_wireless.connect('toggled', self.wireless_toggled)
64 self.plugin_widgets = self.page
65@@ -128,6 +129,7 @@
66 frontend.connecting_spinner.hide()
67 frontend.connecting_spinner.stop()
68 frontend.connecting_label.hide()
69+ self.no_wireless.set_active(True)
70 return False
71
72 def plugin_on_next_clicked(self):
73@@ -154,7 +156,7 @@
74 self.controller.allow_go_forward(True)
75
76 frontend.translate_widget(frontend.back)
77- self.back_normal = False
78+ self.back_normal = True
79 frontend.back.set_sensitive(True)
80 else:
81 frontend.connecting_spinner.show()

Subscribers

People subscribed via source and target branches