Minor formatting changes

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

diff --git a/src/moonshot-keyring-store.vala b/src/moonshot-keyring-store.vala
index ab1ff1e..6b36022 100644 (file)
--- a/src/moonshot-keyring-store.vala
+++ b/src/moonshot-keyring-store.vala
@@ -40,23 +40,25 @@ public class KeyringStore : Object, IIdentityCardStore {
 
     public void add_card(IdCard card) {
         id_card_list.add(card);
-        store_id_cards ();
+        store_id_cards();
     }
 
     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)
+        store_id_cards();
+        foreach (IdCard idcard in id_card_list) {
+            if (idcard.display_name == card.display_name) {
                 return idcard;
+            }
+        }
         return null;
     }
 
     public bool remove_card(IdCard card) {
         bool retval = id_card_list.remove(card);
         if (retval)
-            store_id_cards ();
+            store_id_cards();
         return retval;
     }
 
@@ -70,9 +72,9 @@ public class KeyringStore : Object, IIdentityCardStore {
 
     /* clear all keyring-stored ids (in preparation to store current list) */
     private void clear_keyring() {
-       GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
-       match.append_string(keyring_store_attribute, keyring_store_version);
-       GLib.List<GnomeKeyring.Found> items;
+        GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
+        match.append_string(keyring_store_attribute, keyring_store_version);
+        GLib.List<GnomeKeyring.Found> items;
         GnomeKeyring.find_items_sync(item_type, match, out items);
         foreach(unowned GnomeKeyring.Found entry in items) {
             GnomeKeyring.Result result = GnomeKeyring.item_delete_sync(null, entry.item_id);
@@ -85,26 +87,26 @@ public class KeyringStore : Object, IIdentityCardStore {
     private void load_id_cards() {
         id_card_list.clear();
 
-       GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
-       match.append_string(keyring_store_attribute, keyring_store_version);
-       GLib.List<GnomeKeyring.Found> items;
+        GnomeKeyring.AttributeList match = new GnomeKeyring.AttributeList();
+        match.append_string(keyring_store_attribute, keyring_store_version);
+        GLib.List<GnomeKeyring.Found> items;
         GnomeKeyring.find_items_sync(item_type, match, out items);
         foreach(unowned GnomeKeyring.Found entry in items) {
-            IdCard id_card = new IdCard ();
+            IdCard id_card = new IdCard();
             int i;
             int rules_patterns_index = -1;
             int rules_always_confirm_index = -1;
             string store_password = null;
-            for (i=0; i<entry.attributes.len; i++) {
+            for (i = 0; i < entry.attributes.len; i++) {
                 var attribute = ((GnomeKeyring.Attribute *) entry.attributes.data)[i];
-               string value = attribute.string_value;
-               if (attribute.name == "Issuer") {
+                string value = attribute.string_value;
+                if (attribute.name == "Issuer") {
                     id_card.issuer = value;
-               } else if (attribute.name == "Username") {
+                } else if (attribute.name == "Username") {
                     id_card.username = value;
-               } else if (attribute.name == "DisplayName") {
+                } else if (attribute.name == "DisplayName") {
                     id_card.display_name = value;
-               } else if (attribute.name == "Services") {
+                } else if (attribute.name == "Services") {
                     id_card.services = value.split(";");
                 } else if (attribute.name == "Rules-Pattern") {
                     rules_patterns_index = i;
@@ -128,12 +130,12 @@ public class KeyringStore : Object, IIdentityCardStore {
                 string [] rules_always_confirm = rules_always_confirm_all.split(";");
                 string [] rules_patterns = rules_patterns_all.split(";");
                 if (rules_patterns.length == rules_always_confirm.length) {
-                   Rule[] rules = new Rule[rules_patterns.length];
-                   for (int j=0; j<rules_patterns.length; j++) {
-                       rules[j].pattern = rules_patterns[j];
-                       rules[j].always_confirm = rules_always_confirm[j];
-                   }
-                   id_card.rules = rules;
+                    Rule[] rules = new Rule[rules_patterns.length];
+                    for (int j = 0; j < rules_patterns.length; j++) {
+                        rules[j].pattern = rules_patterns[j];
+                        rules[j].always_confirm = rules_always_confirm[j];
+                    }
+                    id_card.rules = rules;
                 }
             }
 
@@ -150,7 +152,7 @@ public class KeyringStore : Object, IIdentityCardStore {
         }
     }
 
-    public void store_id_cards () {
+    public void store_id_cards() {
         clear_keyring();
         foreach (IdCard id_card in this.id_card_list) {
             /* workaround for Centos vala array property bug: use temp array */
@@ -159,7 +161,7 @@ public class KeyringStore : Object, IIdentityCardStore {
             string[] rules_patterns = new string[rules.length];
             string[] rules_always_conf = new string[rules.length];
             
-            for (int i=0; i<rules.length; i++) {
+            for (int i = 0; i < rules.length; i++) {
                 rules_patterns[i] = rules[i].pattern;
                 rules_always_conf[i] = rules[i].always_confirm;
             }
@@ -182,9 +184,9 @@ public class KeyringStore : Object, IIdentityCardStore {
             attributes.append_string("StorePassword", id_card.store_password ? "yes" : "no");
 
             GnomeKeyring.Result result = GnomeKeyring.item_create_sync(null,
-                item_type, id_card.display_name, attributes,
-                id_card.store_password ? id_card.password : "",
-                true, out item_id);
+                                                                       item_type, id_card.display_name, attributes,
+                                                                       id_card.store_password ? id_card.password : "",
+                                                                       true, out item_id);
             if (result != GnomeKeyring.Result.OK) {
                 stdout.printf("GnomeKeyring.item_create_sync() failed. result: %d", result);
             }
@@ -192,7 +194,7 @@ public class KeyringStore : Object, IIdentityCardStore {
         load_id_cards();
     }
 
-    public KeyringStore () {
+    public KeyringStore() {
         id_card_list = new LinkedList<IdCard>();
         load_id_cards();
     }