Fix id card nai getter

diff --git a/src/moonshot-id.vala b/src/moonshot-id.vala
index a2d59ac..58af2d7 100644 (file)
--- a/src/moonshot-id.vala
+++ b/src/moonshot-id.vala
@@ -30,5 +30,5 @@ public class IdCard : Object
   
   public Gdk.Pixbuf pixbuf { get; set; default = null; }    
 
-  public unowned string nai { get {  _nai = username + "@" + password; return _nai;}}
+  public unowned string nai { get {  _nai = username + "@" + issuer; return _nai;}}
 }

diff --git a/src/moonshot-window.vala b/src/moonshot-window.vala
index 9ae8806..eda06bf 100644 (file)
--- a/src/moonshot-window.vala
+++ b/src/moonshot-window.vala
@@ -85,7 +85,8 @@ class MainWindow : Window
 
         foreach (IdCard candidate in candidates)
         {
-            if (&candidate == &id_card)
+            debug ("candidates -- %s", candidate.display_name);
+            if (candidate != id_card)
                 return true;
         }
         
@@ -452,7 +453,7 @@ class MainWindow : Window
             bool has_srv = request.service != null && request.service != "";
             bool confirm = false;
             IdCard nai_provided = null;
-            
+
             foreach (IdCard id in identities_manager.id_card_list)
             {
                 /* If NAI matches we add id card to the candidate list */