From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Wed, 19 Mar 2014 09:35:20 +0000 (-0400)
Subject: Avoid using the 'No Identity' card as the default identity. LP 1294559
X-Git-Tag: 0.7.1~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=7aca03870611536df1e62e4af4e49b01f1220752

Avoid using the 'No Identity' card as the default identity. LP 1294559
---

diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala
index 37d30e1..4eebbda 100644
--- a/src/moonshot-identity-management-view.vala
+++ b/src/moonshot-identity-management-view.vala
@@ -520,7 +520,7 @@ public class IdentityManagerView : Window {
         filter.refilter();
         redraw_id_card_widgets ();
 
-        if (identity != null)
+        if ((identity != null) && (!identity.IsNoIdentity()))
             parent_app.default_id_card = identity;
 
         request.return_identity (identity);
diff --git a/src/moonshot-identity-manager-app.vala b/src/moonshot-identity-manager-app.vala
index a9a4c33..cbe1e43 100644
--- a/src/moonshot-identity-manager-app.vala
+++ b/src/moonshot-identity-manager-app.vala
@@ -62,7 +62,7 @@ public class IdentityManagerApp {
             view = new IdentityManagerView(this);
         LinkedList<IdCard> card_list = model.get_card_list() ;
         if (card_list.size > 0)
-            this.default_id_card = card_list.first();
+            this.default_id_card = card_list.last();
 
         init_ipc_server ();