Merge lp:~kvalo/indicator-network/settings-passphrase-fix into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good

review: Approve

=== modified file 'src/libconnman/connman-service.c'
--- src/libconnman/connman-service.c	2011-02-15 10:24:00 +0000
+++ src/libconnman/connman-service.c	2011-02-17 14:56:30 +0000
@@ -1392,7 +1392,7 @@
   if (priv->passphrase == NULL)
     return;
 
-  value = g_variant_new("(s)", priv->passphrase);
+  value = g_variant_new("s", priv->passphrase);
 
   set_service_property(self, "Passphrase", value);
 }
@@ -1415,7 +1415,7 @@
   if (priv->apn == NULL)
     return;
 
-  value = g_variant_new("(s)", priv->apn);
+  value = g_variant_new("s", priv->apn);
 
   set_service_property(self, "APN", value);
 }

=== modified file 'src/settings/frontend/widgets/dialogs/edit-connection.vala'
--- src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-02-16 13:53:37 +0000
+++ src/settings/frontend/widgets/dialogs/edit-connection.vala	2011-02-17 14:56:30 +0000
@@ -218,8 +218,7 @@
     }
 
     private void save_passphrase() {
-        /* FIXME: fix libconnman */
-        // this.connection.passphrase = this.entry_passphrase.get_text();
+        this.connection.passphrase = this.entry_passphrase.get_text();
     }
 
     private void update_ipv4() {