Merge lp:~kvalo/indicator-network/bug-736867 into lp:~indicator-applet-developers/indicator-network/indicator-network

Proposed by Kalle Valo
Status: Merged
Merged at revision: 180
Proposed branch: lp:~kvalo/indicator-network/bug-736867
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 51 lines (+11/-1)
2 files modified
src/settings/frontend/widgets/dialogs/edit-connection.vala (+10/-0)
src/settings/ui/edit_connection_dialog.ui (+1/-1)
To merge this branch: bzr merge lp:~kvalo/indicator-network/bug-736867
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+54680@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/settings/frontend/widgets/dialogs/edit-connection.vala'
2--- src/settings/frontend/widgets/dialogs/edit-connection.vala 2011-03-18 12:42:40 +0000
3+++ src/settings/frontend/widgets/dialogs/edit-connection.vala 2011-03-24 11:41:03 +0000
4@@ -42,8 +42,10 @@
5 private Gtk.CheckButton checkbutton_autoconnect;
6
7 /* wifi */
8+ private Gtk.Table table_wireless;
9 private Gtk.Label label_mode;
10 private Gtk.Label label_security;
11+ private Gtk.Label label_passphrase;
12 private Gtk.Entry entry_passphrase;
13
14 /* ipv4 */
15@@ -220,8 +222,10 @@
16 as Gtk.CheckButton;
17
18 /* wifi */
19+ this.table_wireless = b.get_object("table_wireless") as Gtk.Table;
20 this.label_mode = b.get_object("label_mode") as Gtk.Label;
21 this.label_security = b.get_object("label_security") as Gtk.Label;
22+ this.label_passphrase = b.get_object("label_passphrase") as Gtk.Label;
23 this.entry_passphrase = b.get_object("entry_passphrase") as Gtk.Entry;
24
25 /* ipv4 */
26@@ -362,6 +366,12 @@
27 }
28
29 private void update_passphrase() {
30+ if (this.connection.security == Connman.ServiceSecurity.NONE) {
31+ this.table_wireless.remove(this.entry_passphrase);
32+ this.table_wireless.remove(this.label_passphrase);
33+ return;
34+ }
35+
36 this.entry_passphrase.set_text(this.connection.passphrase);
37 }
38
39
40=== modified file 'src/settings/ui/edit_connection_dialog.ui'
41--- src/settings/ui/edit_connection_dialog.ui 2011-03-17 13:28:03 +0000
42+++ src/settings/ui/edit_connection_dialog.ui 2011-03-24 11:41:03 +0000
43@@ -131,7 +131,7 @@
44 </packing>
45 </child>
46 <child>
47- <object class="GtkLabel" id="label14">
48+ <object class="GtkLabel" id="label_passphrase">
49 <property name="visible">True</property>
50 <property name="xalign">1</property>
51 <property name="label" translatable="yes">Passphrase:</property>

Subscribers

People subscribed via source and target branches