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

Proposed by Kalle Valo
Status: Merged
Merged at revision: 148
Proposed branch: lp:~kvalo/indicator-network/settings-passphrase-fix
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 35 lines (+3/-4)
2 files modified
src/libconnman/connman-service.c (+2/-2)
src/settings/frontend/widgets/dialogs/edit-connection.vala (+1/-2)
To merge this branch: bzr merge lp:~kvalo/indicator-network/settings-passphrase-fix
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+50161@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1392 if (priv->passphrase == NULL)1392 if (priv->passphrase == NULL)
1393 return;1393 return;
13941394
1395 value = g_variant_new("(s)", priv->passphrase);1395 value = g_variant_new("s", priv->passphrase);
13961396
1397 set_service_property(self, "Passphrase", value);1397 set_service_property(self, "Passphrase", value);
1398}1398}
@@ -1415,7 +1415,7 @@
1415 if (priv->apn == NULL)1415 if (priv->apn == NULL)
1416 return;1416 return;
14171417
1418 value = g_variant_new("(s)", priv->apn);1418 value = g_variant_new("s", priv->apn);
14191419
1420 set_service_property(self, "APN", value);1420 set_service_property(self, "APN", value);
1421}1421}
14221422
=== 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 @@
218 }218 }
219219
220 private void save_passphrase() {220 private void save_passphrase() {
221 /* FIXME: fix libconnman */221 this.connection.passphrase = this.entry_passphrase.get_text();
222 // this.connection.passphrase = this.entry_passphrase.get_text();
223 }222 }
224223
225 private void update_ipv4() {224 private void update_ipv4() {

Subscribers

People subscribed via source and target branches