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

[Kalle Valo]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good to me

review: Approve

=== modified file 'src/settings/frontend/widgets/dialogs/edit-connection.vala'
--- src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-03-18 12:42:40 +0000
+++ src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-03-24 11:41:03 +0000
@@ -42,8 +42,10 @@
     private Gtk.CheckButton checkbutton_autoconnect;
 
     /* wifi */
+    private Gtk.Table table_wireless;
     private Gtk.Label label_mode;
     private Gtk.Label label_security;
+    private Gtk.Label label_passphrase;
     private Gtk.Entry entry_passphrase;
 
     /* ipv4 */
@@ -220,8 +222,10 @@
                                         as Gtk.CheckButton;
 
         /* wifi */
+        this.table_wireless = b.get_object("table_wireless") as Gtk.Table;
         this.label_mode = b.get_object("label_mode") as Gtk.Label;
         this.label_security = b.get_object("label_security") as Gtk.Label;
+        this.label_passphrase = b.get_object("label_passphrase") as Gtk.Label;
         this.entry_passphrase = b.get_object("entry_passphrase") as Gtk.Entry;
 
         /* ipv4 */
@@ -362,6 +366,12 @@
     }
 
     private void update_passphrase() {
+        if (this.connection.security == Connman.ServiceSecurity.NONE) {
+            this.table_wireless.remove(this.entry_passphrase);
+            this.table_wireless.remove(this.label_passphrase);
+            return;
+        }
+
         this.entry_passphrase.set_text(this.connection.passphrase);
     }
 
 
=== modified file 'src/settings/ui/edit_connection_dialog.ui'
--- src/settings/ui/edit_connection_dialog.ui	2011-03-17 13:28:03 +0000
+++ src/settings/ui/edit_connection_dialog.ui	2011-03-24 11:41:03 +0000
@@ -131,7 +131,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label14">
+                      <object class="GtkLabel" id="label_passphrase">
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <property name="label" translatable="yes">Passphrase:</property>