Don't create duplicate identities. LP 1180914.

[moonshot-ui.git] / src / moonshot-keyring-store.vala

diff --git a/src/moonshot-keyring-store.vala b/src/moonshot-keyring-store.vala
index f99e80f..e8daeb2 100644 (file)
--- a/src/moonshot-keyring-store.vala
+++ b/src/moonshot-keyring-store.vala
@@ -12,15 +12,21 @@ public class KeyringStore : Object, IIdentityCardStore {
         store_id_cards ();
     }
 
-    public void update_card(IdCard card) {
+    public IdCard? update_card(IdCard card) {
         id_card_list.remove(card);
         id_card_list.add(card);
         store_id_cards ();
+        foreach (IdCard idcard in id_card_list)
+            if (idcard.display_name == card.display_name)
+                return idcard;
+        return null;
     }
 
-    public void remove_card(IdCard card) {
-        id_card_list.remove(card);
-        store_id_cards ();
+    public bool remove_card(IdCard card) {
+        bool retval = id_card_list.remove(card);
+        if (retval)
+            store_id_cards ();
+        return retval;
     }
 
     public IIdentityCardStore.StoreType get_store_type() {
@@ -59,7 +65,7 @@ public class KeyringStore : Object, IIdentityCardStore {
             int rules_always_confirm_index = -1;
             string store_password = null;
             for (i=0; i<entry.attributes.len; i++) {
-                var attribute =  ((GnomeKeyring.Attribute *) entry.attributes.data[i]);
+                var attribute = ((GnomeKeyring.Attribute *) entry.attributes.data)[i];
                string value = attribute.string_value;
                if (attribute.name == "Issuer") {
                     id_card.issuer = value;
@@ -86,8 +92,8 @@ public class KeyringStore : Object, IIdentityCardStore {
                 }
             }
             if ((rules_always_confirm_index != -1) && (rules_patterns_index != -1)) {
-                string rules_patterns_all = ((GnomeKeyring.Attribute *) entry.attributes.data[rules_patterns_index]) .string_value;
-                string rules_always_confirm_all = ((GnomeKeyring.Attribute *) entry.attributes.data[rules_always_confirm_index]) .string_value;
+                string rules_patterns_all = ((GnomeKeyring.Attribute *) entry.attributes.data)[rules_patterns_index].string_value;
+                string rules_always_confirm_all = ((GnomeKeyring.Attribute *) entry.attributes.data)[rules_always_confirm_index].string_value;
                 string [] rules_always_confirm = rules_always_confirm_all.split(";");
                 string [] rules_patterns = rules_patterns_all.split(";");
                 if (rules_patterns.length == rules_always_confirm.length) {