autoreconf

[moonshot-ui.git] / src / moonshot-id.vala

diff --git a/src/moonshot-id.vala b/src/moonshot-id.vala
index a68af68..58af2d7 100644 (file)
--- a/src/moonshot-id.vala
+++ b/src/moonshot-id.vala
@@ -1,9 +1,9 @@
 public class TrustAnchor : Object
 {
-  public string ca_cert {get; set; default = null;}
-  public string subject {get; set; default = null;}
-  public string subject_alt  {get; set; default = null;}
-  public string server_cert  {get; set; default = null;}
+  public string ca_cert {get; set; default = "";}
+  public string subject {get; set; default = "";}
+  public string subject_alt  {get; set; default = "";}
+  public string server_cert  {get; set; default = "";}
 }
 
 public struct Rule
@@ -14,20 +14,21 @@ public struct Rule
 
 public class IdCard : Object
 {
-  public string display_name { get; set; default = null; }
+  private string _nai;
   
-  public string username { get; set; default = null; }
+  public string display_name { get; set; default = ""; }
+  
+  public string username { get; set; default = ""; }
   public string password { get; set; default = null; }
 
-  public string issuer { get; set; default = null; }
+  public string issuer { get; set; default = ""; }
   
-  public Rule[] rules;
+  public Rule[] rules {get; set; default = {};}
+  public string[] services { get; set; default = {}; }
 
   public TrustAnchor trust_anchor  { get; set; default = new TrustAnchor (); }
   
   public Gdk.Pixbuf pixbuf { get; set; default = null; }    
-  public string[] services { get; set; default = {}; }
 
-  //TODO: Set the getter and remove the setter/default
-  public string nai { get; set; default = null; }
+  public unowned string nai { get {  _nai = username + "@" + issuer; return _nai;}}
 }