From d9599f082f4ce435fed2d2dc07e2bd2a8e2c4473 Mon Sep 17 00:00:00 2001 From: Dan Breslau Date: Tue, 25 Oct 2016 20:44:04 -0400 Subject: [PATCH] Fixed removal of services so that it doesn't affect the IdCard until the OK button is pressed. Also updated the last commit, ensuring that the "Remember this service" checkbox is true by default. --- src/moonshot-identity-dialog.vala | 10 +++++++--- src/moonshot-identity-management-view.vala | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/moonshot-identity-dialog.vala b/src/moonshot-identity-dialog.vala index 68183ef..6f59f2f 100644 --- a/src/moonshot-identity-dialog.vala +++ b/src/moonshot-identity-dialog.vala @@ -69,6 +69,7 @@ class IdentityDialog : Dialog private Label message_label; public bool complete; private IdCard card; + private ArrayList services; private Label selected_item = null; @@ -105,7 +106,7 @@ class IdentityDialog : Dialog internal ArrayList get_services() { - return card.services; + return services; } public IdentityDialog(IdentityManagerView parent) @@ -181,6 +182,9 @@ class IdentityDialog : Dialog this.response.connect(on_response); content_area.set_border_width(6); + this.services = new ArrayList(); + this.services.add_all(card.services); + if (!is_new_card) { Widget trust_anchor_box = make_trust_anchor_box(card); @@ -445,7 +449,7 @@ class IdentityDialog : Dialog services_vbox.pack_start(table_button_hbox, true, true, 0); int i = 0; - foreach (string service in card.services) + foreach (string service in services) { var label = new Label(service); label.set_alignment((float) 0, (float) 0); @@ -501,7 +505,7 @@ class IdentityDialog : Dialog if (result) { if (card != null) { - card.services.remove(selected_item.label); + services.remove(selected_item.label); services_table.remove(selected_item.parent); selected_item = null; remove_button.set_sensitive(false); diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala index 371f5d7..110dd84 100644 --- a/src/moonshot-identity-management-view.vala +++ b/src/moonshot-identity-management-view.vala @@ -613,7 +613,7 @@ public class IdentityManagerView : Window { request.return_identity(identity, remember_identity_binding.active); - remember_identity_binding.active = false; + remember_identity_binding.active = true; remember_identity_binding.hide(); } -- 2.1.4