vala

[moonshot-ui.git] / src / moonshot-identities-manager.c

diff --git a/src/moonshot-identities-manager.c b/src/moonshot-identities-manager.c
index afd93d6..a88dc62 100644 (file)
--- a/src/moonshot-identities-manager.c
+++ b/src/moonshot-identities-manager.c
@@ -1,4 +1,4 @@
-/* moonshot-identities-manager.c generated by valac 0.24.0, the Vala compiler
+/* moonshot-identities-manager.c generated by valac 0.26.1, the Vala compiler
  * generated from moonshot-identities-manager.vala, do not modify */
 
 /*
@@ -257,9 +257,9 @@ enum  {
 #define IDENTITY_MANAGER_MODEL_FILE_NAME "identities.txt"
 GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self);
 GeeLinkedList* iidentity_card_store_get_card_list (IIdentityCardStore* self);
-static gint __lambda3_ (gconstpointer a, gconstpointer b);
+static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b);
 gboolean id_card_IsNoIdentity (IdCard* self);
-static gint ___lambda3__gcompare_func (gconstpointer a, gconstpointer b);
+static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 IdCard* id_card_NewNoIdentity (void);
 gboolean id_card_get_store_password (IdCard* self);
 gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* self, const gchar* name, gchar** candidate);
@@ -556,7 +556,7 @@ static void password_class_init (PasswordClass * klass) {
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        password_parent_class = g_type_class_peek_parent (klass);
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       PASSWORD_CLASS (klass)->finalize = password_finalize;
+       ((PasswordClass *) klass)->finalize = password_finalize;
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_type_class_add_private (klass, sizeof (PasswordPrivate));
 #line 563 "moonshot-identities-manager.c"
@@ -576,9 +576,11 @@ static void password_finalize (Password* obj) {
        Password * self;
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PASSWORD, Password);
+#line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
+       g_signal_handlers_destroy (self);
 #line 59 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        password_set_password (self, NULL);
-#line 582 "moonshot-identities-manager.c"
+#line 584 "moonshot-identities-manager.c"
 }
 
 
@@ -603,7 +605,7 @@ gpointer password_ref (gpointer instance) {
        g_atomic_int_inc (&self->ref_count);
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return instance;
-#line 607 "moonshot-identities-manager.c"
+#line 609 "moonshot-identities-manager.c"
 }
 
 
@@ -616,7 +618,7 @@ void password_unref (gpointer instance) {
                PASSWORD_GET_CLASS (self)->finalize (self);
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                g_type_free_instance ((GTypeInstance *) self);
-#line 620 "moonshot-identities-manager.c"
+#line 622 "moonshot-identities-manager.c"
        }
 }
 
@@ -649,7 +651,7 @@ static gchar* password_hash_table_ComputeHashKey (IdCard* card, IIdentityCardSto
        result = _tmp5_;
 #line 67 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 653 "moonshot-identities-manager.c"
+#line 655 "moonshot-identities-manager.c"
 }
 
 
@@ -686,7 +688,7 @@ void password_hash_table_CachePassword (PasswordHashTable* self, IdCard* card, I
        _tmp7_ = password_new (_tmp6_);
 #line 71 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_hash_table_replace (_tmp0_, _tmp3_, _tmp7_);
-#line 690 "moonshot-identities-manager.c"
+#line 692 "moonshot-identities-manager.c"
 }
 
 
@@ -716,7 +718,7 @@ void password_hash_table_RemovePassword (PasswordHashTable* self, IdCard* card,
        g_hash_table_remove (_tmp0_, _tmp4_);
 #line 75 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _g_free0 (_tmp4_);
-#line 720 "moonshot-identities-manager.c"
+#line 722 "moonshot-identities-manager.c"
 }
 
 
@@ -758,7 +760,7 @@ void password_hash_table_RetrievePassword (PasswordHashTable* self, IdCard* card
        _tmp7_ = password;
 #line 79 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp7_ != NULL) {
-#line 762 "moonshot-identities-manager.c"
+#line 764 "moonshot-identities-manager.c"
                IdCard* _tmp8_ = NULL;
                Password* _tmp9_ = NULL;
                const gchar* _tmp10_ = NULL;
@@ -773,7 +775,7 @@ void password_hash_table_RetrievePassword (PasswordHashTable* self, IdCard* card
                _tmp11_ = _tmp10_;
 #line 80 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                id_card_set_password (_tmp8_, _tmp11_);
-#line 777 "moonshot-identities-manager.c"
+#line 779 "moonshot-identities-manager.c"
        }
 }
 
@@ -781,14 +783,14 @@ void password_hash_table_RetrievePassword (PasswordHashTable* self, IdCard* card
 static void _g_free0_ (gpointer var) {
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        var = (g_free (var), NULL);
-#line 785 "moonshot-identities-manager.c"
+#line 787 "moonshot-identities-manager.c"
 }
 
 
 static void _password_unref0_ (gpointer var) {
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        (var == NULL) ? NULL : (var = (password_unref (var), NULL));
-#line 792 "moonshot-identities-manager.c"
+#line 794 "moonshot-identities-manager.c"
 }
 
 
@@ -811,14 +813,14 @@ PasswordHashTable* password_hash_table_construct (GType object_type) {
        self->priv->password_table = _tmp2_;
 #line 83 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self;
-#line 815 "moonshot-identities-manager.c"
+#line 817 "moonshot-identities-manager.c"
 }
 
 
 PasswordHashTable* password_hash_table_new (void) {
 #line 83 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return password_hash_table_construct (TYPE_PASSWORD_HASH_TABLE);
-#line 822 "moonshot-identities-manager.c"
+#line 824 "moonshot-identities-manager.c"
 }
 
 
@@ -829,14 +831,14 @@ static void password_hash_table_class_init (PasswordHashTableClass * klass) {
        g_type_class_add_private (klass, sizeof (PasswordHashTablePrivate));
 #line 63 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        G_OBJECT_CLASS (klass)->finalize = password_hash_table_finalize;
-#line 833 "moonshot-identities-manager.c"
+#line 835 "moonshot-identities-manager.c"
 }
 
 
 static void password_hash_table_instance_init (PasswordHashTable * self) {
 #line 63 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        self->priv = PASSWORD_HASH_TABLE_GET_PRIVATE (self);
-#line 840 "moonshot-identities-manager.c"
+#line 842 "moonshot-identities-manager.c"
 }
 
 
@@ -848,7 +850,7 @@ static void password_hash_table_finalize (GObject* obj) {
        _g_hash_table_unref0 (self->priv->password_table);
 #line 63 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        G_OBJECT_CLASS (password_hash_table_parent_class)->finalize (obj);
-#line 852 "moonshot-identities-manager.c"
+#line 854 "moonshot-identities-manager.c"
 }
 
 
@@ -867,17 +869,17 @@ GType password_hash_table_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self ? g_object_ref (self) : NULL;
-#line 871 "moonshot-identities-manager.c"
+#line 873 "moonshot-identities-manager.c"
 }
 
 
-static gint __lambda3_ (gconstpointer a, gconstpointer b) {
+static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
        gint result = 0;
        IdCard* id_a = NULL;
-       gconstpointer _tmp0_ = NULL;
+       IdCard* _tmp0_ = NULL;
        IdCard* _tmp1_ = NULL;
        IdCard* id_b = NULL;
-       gconstpointer _tmp2_ = NULL;
+       IdCard* _tmp2_ = NULL;
        IdCard* _tmp3_ = NULL;
        gboolean _tmp4_ = FALSE;
        IdCard* _tmp5_ = NULL;
@@ -890,6 +892,10 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
        const gchar* _tmp19_ = NULL;
        const gchar* _tmp20_ = NULL;
        gint _tmp21_ = 0;
+#line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
+       g_return_val_if_fail (a != NULL, 0);
+#line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
+       g_return_val_if_fail (b != NULL, 0);
 #line 95 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp0_ = a;
 #line 95 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -908,7 +914,7 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
        _tmp6_ = id_card_IsNoIdentity (_tmp5_);
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp6_) {
-#line 912 "moonshot-identities-manager.c"
+#line 918 "moonshot-identities-manager.c"
                IdCard* _tmp7_ = NULL;
                gboolean _tmp8_ = FALSE;
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -917,11 +923,11 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
                _tmp8_ = id_card_IsNoIdentity (_tmp7_);
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp4_ = !_tmp8_;
-#line 921 "moonshot-identities-manager.c"
+#line 927 "moonshot-identities-manager.c"
        } else {
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp4_ = FALSE;
-#line 925 "moonshot-identities-manager.c"
+#line 931 "moonshot-identities-manager.c"
        }
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp4_) {
@@ -933,7 +939,7 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
                _g_object_unref0 (id_a);
 #line 98 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 937 "moonshot-identities-manager.c"
+#line 943 "moonshot-identities-manager.c"
        } else {
                gboolean _tmp9_ = FALSE;
                IdCard* _tmp10_ = NULL;
@@ -944,7 +950,7 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
                _tmp11_ = id_card_IsNoIdentity (_tmp10_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                if (_tmp11_) {
-#line 948 "moonshot-identities-manager.c"
+#line 954 "moonshot-identities-manager.c"
                        IdCard* _tmp12_ = NULL;
                        gboolean _tmp13_ = FALSE;
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -953,11 +959,11 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
                        _tmp13_ = id_card_IsNoIdentity (_tmp12_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = !_tmp13_;
-#line 957 "moonshot-identities-manager.c"
+#line 963 "moonshot-identities-manager.c"
                } else {
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = FALSE;
-#line 961 "moonshot-identities-manager.c"
+#line 967 "moonshot-identities-manager.c"
                }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                if (_tmp9_) {
@@ -969,7 +975,7 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
                        _g_object_unref0 (id_a);
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        return result;
-#line 973 "moonshot-identities-manager.c"
+#line 979 "moonshot-identities-manager.c"
                }
        }
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -996,16 +1002,16 @@ static gint __lambda3_ (gconstpointer a, gconstpointer b) {
        _g_object_unref0 (id_a);
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1000 "moonshot-identities-manager.c"
+#line 1006 "moonshot-identities-manager.c"
 }
 
 
-static gint ___lambda3__gcompare_func (gconstpointer a, gconstpointer b) {
+static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
        gint result;
-       result = __lambda3_ (a, b);
+       result = __lambda4_ ((IdentityManagerModel*) self, (IdCard*) a, (IdCard*) b);
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1009 "moonshot-identities-manager.c"
+#line 1015 "moonshot-identities-manager.c"
 }
 
 
@@ -1030,18 +1036,18 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp2_ = identities;
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       gee_list_sort ((GeeList*) _tmp2_, ___lambda3__gcompare_func);
+       gee_list_sort ((GeeList*) _tmp2_, ___lambda4__gcompare_data_func, g_object_ref (self), g_object_unref);
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp4_ = identities;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       _tmp5_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp4_);
+       _tmp5_ = gee_collection_get_is_empty ((GeeCollection*) _tmp4_);
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp6_ = _tmp5_;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp6_) {
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp3_ = TRUE;
-#line 1045 "moonshot-identities-manager.c"
+#line 1051 "moonshot-identities-manager.c"
        } else {
                GeeLinkedList* _tmp7_ = NULL;
                gpointer _tmp8_ = NULL;
@@ -1059,11 +1065,11 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                _tmp3_ = !_tmp10_;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_tmp9_);
-#line 1063 "moonshot-identities-manager.c"
+#line 1069 "moonshot-identities-manager.c"
        }
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp3_) {
-#line 1067 "moonshot-identities-manager.c"
+#line 1073 "moonshot-identities-manager.c"
                GeeLinkedList* _tmp11_ = NULL;
                IdCard* _tmp12_ = NULL;
                IdCard* _tmp13_ = NULL;
@@ -1077,7 +1083,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                gee_abstract_list_insert ((GeeAbstractList*) _tmp11_, 0, _tmp13_);
 #line 105 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_tmp13_);
-#line 1081 "moonshot-identities-manager.c"
+#line 1087 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_card_list = NULL;
@@ -1106,7 +1112,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                _id_card_index = -1;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1110 "moonshot-identities-manager.c"
+#line 1116 "moonshot-identities-manager.c"
                        gint _tmp19_ = 0;
                        gint _tmp20_ = 0;
                        gint _tmp21_ = 0;
@@ -1129,7 +1135,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                        if (!(_tmp20_ < _tmp21_)) {
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1133 "moonshot-identities-manager.c"
+#line 1139 "moonshot-identities-manager.c"
                        }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp22_ = _id_card_list;
@@ -1147,7 +1153,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                        _tmp27_ = _tmp26_;
 #line 107 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (!_tmp27_) {
-#line 1151 "moonshot-identities-manager.c"
+#line 1157 "moonshot-identities-manager.c"
                                PasswordHashTable* _tmp28_ = NULL;
                                IdCard* _tmp29_ = NULL;
                                IIdentityCardStore* _tmp30_ = NULL;
@@ -1159,21 +1165,21 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                                _tmp30_ = self->priv->store;
 #line 108 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                password_hash_table_RetrievePassword (_tmp28_, _tmp29_, _tmp30_);
-#line 1163 "moonshot-identities-manager.c"
+#line 1169 "moonshot-identities-manager.c"
                        }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id_card);
-#line 1167 "moonshot-identities-manager.c"
+#line 1173 "moonshot-identities-manager.c"
                }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_card_list);
-#line 1171 "moonshot-identities-manager.c"
+#line 1177 "moonshot-identities-manager.c"
        }
 #line 111 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = identities;
 #line 111 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1177 "moonshot-identities-manager.c"
+#line 1183 "moonshot-identities-manager.c"
 }
 
 
@@ -1190,152 +1196,155 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                _g_free0 (_vala_candidate);
 #line 120 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _vala_candidate = NULL;
-#line 1194 "moonshot-identities-manager.c"
+#line 1200 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_card_list = NULL;
-               GeeLinkedList* _tmp0_ = NULL;
-               gint _id_card_size = 0;
+               IIdentityCardStore* _tmp0_ = NULL;
                GeeLinkedList* _tmp1_ = NULL;
-               gint _tmp2_ = 0;
+               gint _id_card_size = 0;
+               GeeLinkedList* _tmp2_ = NULL;
                gint _tmp3_ = 0;
+               gint _tmp4_ = 0;
                gint _id_card_index = 0;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _tmp0_ = identity_manager_model_get_card_list (self);
+               _tmp0_ = self->priv->store;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _id_card_list = _tmp0_;
+               _tmp1_ = iidentity_card_store_get_card_list (_tmp0_);
+#line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
+               _id_card_list = _tmp1_;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _tmp1_ = _id_card_list;
+               _tmp2_ = _id_card_list;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _tmp2_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp1_);
+               _tmp3_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp2_);
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _tmp3_ = _tmp2_;
+               _tmp4_ = _tmp3_;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-               _id_card_size = _tmp3_;
+               _id_card_size = _tmp4_;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _id_card_index = -1;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1220 "moonshot-identities-manager.c"
-                       gint _tmp4_ = 0;
+#line 1229 "moonshot-identities-manager.c"
                        gint _tmp5_ = 0;
                        gint _tmp6_ = 0;
+                       gint _tmp7_ = 0;
                        IdCard* id_card = NULL;
-                       GeeLinkedList* _tmp7_ = NULL;
-                       gint _tmp8_ = 0;
-                       gpointer _tmp9_ = NULL;
-                       IdCard* _tmp10_ = NULL;
-                       const gchar* _tmp11_ = NULL;
+                       GeeLinkedList* _tmp8_ = NULL;
+                       gint _tmp9_ = 0;
+                       gpointer _tmp10_ = NULL;
+                       IdCard* _tmp11_ = NULL;
                        const gchar* _tmp12_ = NULL;
                        const gchar* _tmp13_ = NULL;
+                       const gchar* _tmp14_ = NULL;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp4_ = _id_card_index;
+                       _tmp5_ = _id_card_index;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _id_card_index = _tmp4_ + 1;
+                       _id_card_index = _tmp5_ + 1;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp5_ = _id_card_index;
+                       _tmp6_ = _id_card_index;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp6_ = _id_card_size;
+                       _tmp7_ = _id_card_size;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       if (!(_tmp5_ < _tmp6_)) {
+                       if (!(_tmp6_ < _tmp7_)) {
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1244 "moonshot-identities-manager.c"
+#line 1253 "moonshot-identities-manager.c"
                        }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp7_ = _id_card_list;
+                       _tmp8_ = _id_card_list;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp8_ = _id_card_index;
+                       _tmp9_ = _id_card_index;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp9_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, _tmp8_);
+                       _tmp10_ = gee_abstract_list_get ((GeeAbstractList*) _tmp8_, _tmp9_);
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       id_card = (IdCard*) _tmp9_;
+                       id_card = (IdCard*) _tmp10_;
 #line 123 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp10_ = id_card;
+                       _tmp11_ = id_card;
 #line 123 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp11_ = id_card_get_display_name (_tmp10_);
+                       _tmp12_ = id_card_get_display_name (_tmp11_);
 #line 123 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp12_ = _tmp11_;
+                       _tmp13_ = _tmp12_;
 #line 123 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp13_ = name;
+                       _tmp14_ = name;
 #line 123 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       if (g_strcmp0 (_tmp12_, _tmp13_) == 0) {
+                       if (g_strcmp0 (_tmp13_, _tmp14_) == 0) {
 #line 125 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                if ((&_vala_candidate) != NULL) {
-#line 1266 "moonshot-identities-manager.c"
+#line 1275 "moonshot-identities-manager.c"
                                        {
                                                gint i = 0;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                i = 0;
-#line 1271 "moonshot-identities-manager.c"
+#line 1280 "moonshot-identities-manager.c"
                                                {
-                                                       gboolean _tmp14_ = FALSE;
+                                                       gboolean _tmp15_ = FALSE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                       _tmp14_ = TRUE;
+                                                       _tmp15_ = TRUE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                        while (TRUE) {
-#line 1278 "moonshot-identities-manager.c"
-                                                               gint _tmp16_ = 0;
+#line 1287 "moonshot-identities-manager.c"
+                                                               gint _tmp17_ = 0;
                                                                gchar* tmp = NULL;
-                                                               const gchar* _tmp17_ = NULL;
-                                                               gint _tmp18_ = 0;
-                                                               gchar* _tmp19_ = NULL;
-                                                               const gchar* _tmp20_ = NULL;
-                                                               gboolean _tmp21_ = FALSE;
+                                                               const gchar* _tmp18_ = NULL;
+                                                               gint _tmp19_ = 0;
+                                                               gchar* _tmp20_ = NULL;
+                                                               const gchar* _tmp21_ = NULL;
+                                                               gboolean _tmp22_ = FALSE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               if (!_tmp14_) {
-#line 1288 "moonshot-identities-manager.c"
-                                                                       gint _tmp15_ = 0;
+                                                               if (!_tmp15_) {
+#line 1297 "moonshot-identities-manager.c"
+                                                                       gint _tmp16_ = 0;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                                       _tmp15_ = i;
+                                                                       _tmp16_ = i;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                                       i = _tmp15_ + 1;
-#line 1294 "moonshot-identities-manager.c"
+                                                                       i = _tmp16_ + 1;
+#line 1303 "moonshot-identities-manager.c"
                                                                }
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp14_ = FALSE;
+                                                               _tmp15_ = FALSE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp16_ = i;
+                                                               _tmp17_ = i;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               if (!(_tmp16_ < 1000)) {
+                                                               if (!(_tmp17_ < 1000)) {
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        break;
-#line 1304 "moonshot-identities-manager.c"
+#line 1313 "moonshot-identities-manager.c"
                                                                }
 #line 129 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp17_ = name;
+                                                               _tmp18_ = name;
 #line 129 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp18_ = i;
+                                                               _tmp19_ = i;
 #line 129 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp19_ = g_strdup_printf ("%s %d", _tmp17_, _tmp18_);
+                                                               _tmp20_ = g_strdup_printf ("%s %d", _tmp18_, _tmp19_);
 #line 129 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               tmp = _tmp19_;
+                                                               tmp = _tmp20_;
 #line 130 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp20_ = tmp;
+                                                               _tmp21_ = tmp;
 #line 130 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               _tmp21_ = identity_manager_model_display_name_is_valid (self, _tmp20_, NULL);
+                                                               _tmp22_ = identity_manager_model_display_name_is_valid (self, _tmp21_, NULL);
 #line 130 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                               if (_tmp21_) {
-#line 1320 "moonshot-identities-manager.c"
-                                                                       const gchar* _tmp22_ = NULL;
-                                                                       gchar* _tmp23_ = NULL;
+                                                               if (_tmp22_) {
+#line 1329 "moonshot-identities-manager.c"
+                                                                       const gchar* _tmp23_ = NULL;
+                                                                       gchar* _tmp24_ = NULL;
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                                       _tmp22_ = tmp;
+                                                                       _tmp23_ = tmp;
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                                       _tmp23_ = g_strdup (_tmp22_);
+                                                                       _tmp24_ = g_strdup (_tmp23_);
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        _g_free0 (_vala_candidate);
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                                                       _vala_candidate = _tmp23_;
+                                                                       _vala_candidate = _tmp24_;
 #line 133 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        _g_free0 (tmp);
 #line 133 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        break;
-#line 1335 "moonshot-identities-manager.c"
+#line 1344 "moonshot-identities-manager.c"
                                                                }
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                _g_free0 (tmp);
-#line 1339 "moonshot-identities-manager.c"
+#line 1348 "moonshot-identities-manager.c"
                                                        }
                                                }
                                        }
@@ -1350,23 +1359,23 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                if (candidate) {
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        *candidate = _vala_candidate;
-#line 1354 "moonshot-identities-manager.c"
+#line 1363 "moonshot-identities-manager.c"
                                } else {
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        _g_free0 (_vala_candidate);
-#line 1358 "moonshot-identities-manager.c"
+#line 1367 "moonshot-identities-manager.c"
                                }
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                return result;
-#line 1362 "moonshot-identities-manager.c"
+#line 1371 "moonshot-identities-manager.c"
                        }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id_card);
-#line 1366 "moonshot-identities-manager.c"
+#line 1375 "moonshot-identities-manager.c"
                }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_card_list);
-#line 1370 "moonshot-identities-manager.c"
+#line 1379 "moonshot-identities-manager.c"
        }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = TRUE;
@@ -1374,15 +1383,15 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
        if (candidate) {
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                *candidate = _vala_candidate;
-#line 1378 "moonshot-identities-manager.c"
+#line 1387 "moonshot-identities-manager.c"
        } else {
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_free0 (_vala_candidate);
-#line 1382 "moonshot-identities-manager.c"
+#line 1391 "moonshot-identities-manager.c"
        }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1386 "moonshot-identities-manager.c"
+#line 1395 "moonshot-identities-manager.c"
 }
 
 
@@ -1398,19 +1407,20 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
        duplicate_found = FALSE;
 #line 146 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        found = FALSE;
-#line 1402 "moonshot-identities-manager.c"
+#line 1411 "moonshot-identities-manager.c"
        {
                gboolean _tmp0_ = FALSE;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = TRUE;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1409 "moonshot-identities-manager.c"
+#line 1418 "moonshot-identities-manager.c"
                        GeeLinkedList* cards = NULL;
-                       GeeLinkedList* _tmp2_ = NULL;
+                       IIdentityCardStore* _tmp2_ = NULL;
+                       GeeLinkedList* _tmp3_ = NULL;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (!_tmp0_) {
-#line 1414 "moonshot-identities-manager.c"
+#line 1424 "moonshot-identities-manager.c"
                                gboolean _tmp1_ = FALSE;
 #line 158 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp1_ = found;
@@ -1418,164 +1428,166 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                if (!_tmp1_) {
 #line 158 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        break;
-#line 1422 "moonshot-identities-manager.c"
+#line 1432 "moonshot-identities-manager.c"
                                }
                        }
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp0_ = FALSE;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       _tmp2_ = identity_manager_model_get_card_list (self);
+                       _tmp2_ = self->priv->store;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                       cards = _tmp2_;
+                       _tmp3_ = iidentity_card_store_get_card_list (_tmp2_);
+#line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
+                       cards = _tmp3_;
 #line 149 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        found = FALSE;
-#line 1433 "moonshot-identities-manager.c"
+#line 1445 "moonshot-identities-manager.c"
                        {
                                GeeLinkedList* _id_card_list = NULL;
-                               GeeLinkedList* _tmp3_ = NULL;
                                GeeLinkedList* _tmp4_ = NULL;
-                               gint _id_card_size = 0;
                                GeeLinkedList* _tmp5_ = NULL;
-                               gint _tmp6_ = 0;
+                               gint _id_card_size = 0;
+                               GeeLinkedList* _tmp6_ = NULL;
                                gint _tmp7_ = 0;
+                               gint _tmp8_ = 0;
                                gint _id_card_index = 0;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _tmp3_ = cards;
+                               _tmp4_ = cards;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _tmp4_ = _g_object_ref0 (_tmp3_);
+                               _tmp5_ = _g_object_ref0 (_tmp4_);
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _id_card_list = _tmp4_;
+                               _id_card_list = _tmp5_;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _tmp5_ = _id_card_list;
+                               _tmp6_ = _id_card_list;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _tmp6_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp5_);
+                               _tmp7_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp6_);
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _tmp7_ = _tmp6_;
+                               _tmp8_ = _tmp7_;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                               _id_card_size = _tmp7_;
+                               _id_card_size = _tmp8_;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _id_card_index = -1;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                while (TRUE) {
-#line 1461 "moonshot-identities-manager.c"
-                                       gint _tmp8_ = 0;
+#line 1473 "moonshot-identities-manager.c"
                                        gint _tmp9_ = 0;
                                        gint _tmp10_ = 0;
+                                       gint _tmp11_ = 0;
                                        IdCard* id_card = NULL;
-                                       GeeLinkedList* _tmp11_ = NULL;
-                                       gint _tmp12_ = 0;
-                                       gpointer _tmp13_ = NULL;
-                                       gboolean _tmp14_ = FALSE;
-                                       IdCard* _tmp15_ = NULL;
+                                       GeeLinkedList* _tmp12_ = NULL;
+                                       gint _tmp13_ = 0;
+                                       gpointer _tmp14_ = NULL;
+                                       gboolean _tmp15_ = FALSE;
                                        IdCard* _tmp16_ = NULL;
+                                       IdCard* _tmp17_ = NULL;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp8_ = _id_card_index;
+                                       _tmp9_ = _id_card_index;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _id_card_index = _tmp8_ + 1;
+                                       _id_card_index = _tmp9_ + 1;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp9_ = _id_card_index;
+                                       _tmp10_ = _id_card_index;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp10_ = _id_card_size;
+                                       _tmp11_ = _id_card_size;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       if (!(_tmp9_ < _tmp10_)) {
+                                       if (!(_tmp10_ < _tmp11_)) {
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                break;
-#line 1484 "moonshot-identities-manager.c"
+#line 1496 "moonshot-identities-manager.c"
                                        }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp11_ = _id_card_list;
+                                       _tmp12_ = _id_card_list;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp12_ = _id_card_index;
+                                       _tmp13_ = _id_card_index;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp13_ = gee_abstract_list_get ((GeeAbstractList*) _tmp11_, _tmp12_);
+                                       _tmp14_ = gee_abstract_list_get ((GeeAbstractList*) _tmp12_, _tmp13_);
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       id_card = (IdCard*) _tmp13_;
+                                       id_card = (IdCard*) _tmp14_;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp15_ = card;
+                                       _tmp16_ = card;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       _tmp16_ = id_card;
+                                       _tmp17_ = id_card;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       if (_tmp15_ != _tmp16_) {
-#line 1500 "moonshot-identities-manager.c"
-                                               IdCard* _tmp17_ = NULL;
-                                               const gchar* _tmp18_ = NULL;
+                                       if (_tmp16_ != _tmp17_) {
+#line 1512 "moonshot-identities-manager.c"
+                                               IdCard* _tmp18_ = NULL;
                                                const gchar* _tmp19_ = NULL;
-                                               IdCard* _tmp20_ = NULL;
-                                               const gchar* _tmp21_ = NULL;
+                                               const gchar* _tmp20_ = NULL;
+                                               IdCard* _tmp21_ = NULL;
                                                const gchar* _tmp22_ = NULL;
+                                               const gchar* _tmp23_ = NULL;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp17_ = id_card;
+                                               _tmp18_ = id_card;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp18_ = id_card_get_nai (_tmp17_);
+                                               _tmp19_ = id_card_get_nai (_tmp18_);
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp19_ = _tmp18_;
+                                               _tmp20_ = _tmp19_;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp20_ = card;
+                                               _tmp21_ = card;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp21_ = id_card_get_nai (_tmp20_);
+                                               _tmp22_ = id_card_get_nai (_tmp21_);
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp22_ = _tmp21_;
+                                               _tmp23_ = _tmp22_;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp14_ = g_strcmp0 (_tmp19_, _tmp22_) == 0;
-#line 1521 "moonshot-identities-manager.c"
+                                               _tmp15_ = g_strcmp0 (_tmp20_, _tmp23_) == 0;
+#line 1533 "moonshot-identities-manager.c"
                                        } else {
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp14_ = FALSE;
-#line 1525 "moonshot-identities-manager.c"
+                                               _tmp15_ = FALSE;
+#line 1537 "moonshot-identities-manager.c"
                                        }
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                       if (_tmp14_) {
-#line 1529 "moonshot-identities-manager.c"
-                                               FILE* _tmp23_ = NULL;
-                                               IdCard* _tmp24_ = NULL;
-                                               const gchar* _tmp25_ = NULL;
+                                       if (_tmp15_) {
+#line 1541 "moonshot-identities-manager.c"
+                                               FILE* _tmp24_ = NULL;
+                                               IdCard* _tmp25_ = NULL;
                                                const gchar* _tmp26_ = NULL;
-                                               IdCard* _tmp27_ = NULL;
-                                               gboolean _tmp28_ = FALSE;
+                                               const gchar* _tmp27_ = NULL;
+                                               IdCard* _tmp28_ = NULL;
+                                               gboolean _tmp29_ = FALSE;
 #line 152 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp23_ = stdout;
+                                               _tmp24_ = stdout;
 #line 152 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp24_ = card;
+                                               _tmp25_ = card;
 #line 152 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp25_ = id_card_get_nai (_tmp24_);
+                                               _tmp26_ = id_card_get_nai (_tmp25_);
 #line 152 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp26_ = _tmp25_;
+                                               _tmp27_ = _tmp26_;
 #line 152 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               fprintf (_tmp23_, "removing duplicate id for '%s'\n", _tmp26_);
+                                               fprintf (_tmp24_, "removing duplicate id for '%s'\n", _tmp27_);
 #line 153 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp27_ = id_card;
+                                               _tmp28_ = id_card;
 #line 153 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               identity_manager_model_remove_card_internal (self, _tmp27_);
+                                               identity_manager_model_remove_card_internal (self, _tmp28_);
 #line 154 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                duplicate_found = TRUE;
 #line 154 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               _tmp28_ = duplicate_found;
+                                               _tmp29_ = duplicate_found;
 #line 154 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-                                               found = _tmp28_;
+                                               found = _tmp29_;
 #line 155 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                _g_object_unref0 (id_card);
 #line 155 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                break;
-#line 1560 "moonshot-identities-manager.c"
+#line 1572 "moonshot-identities-manager.c"
                                        }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        _g_object_unref0 (id_card);
-#line 1564 "moonshot-identities-manager.c"
+#line 1576 "moonshot-identities-manager.c"
                                }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _g_object_unref0 (_id_card_list);
-#line 1568 "moonshot-identities-manager.c"
+#line 1580 "moonshot-identities-manager.c"
                        }
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (cards);
-#line 1572 "moonshot-identities-manager.c"
+#line 1584 "moonshot-identities-manager.c"
                }
        }
 #line 159 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = duplicate_found;
 #line 159 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1579 "moonshot-identities-manager.c"
+#line 1591 "moonshot-identities-manager.c"
 }
 
 
@@ -1604,7 +1616,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
        if (_tmp1_) {
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                identity_manager_model_set_store_type (self, IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE);
-#line 1608 "moonshot-identities-manager.c"
+#line 1620 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_list = NULL;
@@ -1630,7 +1642,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                _id_index = -1;
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1634 "moonshot-identities-manager.c"
+#line 1646 "moonshot-identities-manager.c"
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
                        gint _tmp8_ = 0;
@@ -1654,7 +1666,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                        if (!(_tmp7_ < _tmp8_)) {
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1658 "moonshot-identities-manager.c"
+#line 1670 "moonshot-identities-manager.c"
                        }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = _id_list;
@@ -1674,7 +1686,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                        _tmp15_ = nai;
 #line 169 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (g_strcmp0 (_tmp14_, _tmp15_) == 0) {
-#line 1678 "moonshot-identities-manager.c"
+#line 1690 "moonshot-identities-manager.c"
                                IdCard* _tmp16_ = NULL;
                                IdCard* _tmp17_ = NULL;
 #line 170 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1689,15 +1701,15 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                                _g_object_unref0 (id);
 #line 171 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1693 "moonshot-identities-manager.c"
+#line 1705 "moonshot-identities-manager.c"
                        }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id);
-#line 1697 "moonshot-identities-manager.c"
+#line 1709 "moonshot-identities-manager.c"
                }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_list);
-#line 1701 "moonshot-identities-manager.c"
+#line 1713 "moonshot-identities-manager.c"
        }
 #line 174 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp18_ = saved_store_type;
@@ -1707,29 +1719,29 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
        _tmp20_ = force_flat_file_store;
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp20_) {
-#line 1711 "moonshot-identities-manager.c"
+#line 1723 "moonshot-identities-manager.c"
                IIdentityCardStoreStoreType _tmp21_ = 0;
 #line 176 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp21_ = saved_store_type;
 #line 176 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp19_ = _tmp21_ != IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE;
-#line 1717 "moonshot-identities-manager.c"
+#line 1729 "moonshot-identities-manager.c"
        } else {
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp19_ = FALSE;
-#line 1721 "moonshot-identities-manager.c"
+#line 1733 "moonshot-identities-manager.c"
        }
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp19_) {
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                g_signal_emit_by_name (self, "card-list-changed");
-#line 1727 "moonshot-identities-manager.c"
+#line 1739 "moonshot-identities-manager.c"
        }
 #line 178 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = retval;
 #line 178 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1733 "moonshot-identities-manager.c"
+#line 1745 "moonshot-identities-manager.c"
 }
 
 
@@ -1767,7 +1779,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        if (_tmp2_) {
 #line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return;
-#line 1771 "moonshot-identities-manager.c"
+#line 1783 "moonshot-identities-manager.c"
        }
 #line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp3_ = identity_manager_model_get_store_type (self);
@@ -1779,7 +1791,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        if (_tmp4_) {
 #line 189 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                identity_manager_model_set_store_type (self, IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE);
-#line 1783 "moonshot-identities-manager.c"
+#line 1795 "moonshot-identities-manager.c"
        }
 #line 191 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = card;
@@ -1799,7 +1811,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        candidate = _tmp9_;
 #line 193 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp10_) {
-#line 1803 "moonshot-identities-manager.c"
+#line 1815 "moonshot-identities-manager.c"
                IdCard* _tmp11_ = NULL;
                const gchar* _tmp12_ = NULL;
 #line 195 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1808,7 +1820,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
                _tmp12_ = candidate;
 #line 195 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                id_card_set_display_name (_tmp11_, _tmp12_);
-#line 1812 "moonshot-identities-manager.c"
+#line 1824 "moonshot-identities-manager.c"
        }
 #line 198 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp13_ = card;
@@ -1818,7 +1830,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        _tmp15_ = _tmp14_;
 #line 198 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp15_) {
-#line 1822 "moonshot-identities-manager.c"
+#line 1834 "moonshot-identities-manager.c"
                PasswordHashTable* _tmp16_ = NULL;
                IdCard* _tmp17_ = NULL;
                IIdentityCardStore* _tmp18_ = NULL;
@@ -1830,7 +1842,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
                _tmp18_ = self->priv->store;
 #line 199 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_CachePassword (_tmp16_, _tmp17_, _tmp18_);
-#line 1834 "moonshot-identities-manager.c"
+#line 1846 "moonshot-identities-manager.c"
        }
 #line 200 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp19_ = self->priv->store;
@@ -1846,7 +1858,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        g_signal_emit_by_name (self, "card-list-changed");
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _g_free0 (candidate);
-#line 1850 "moonshot-identities-manager.c"
+#line 1862 "moonshot-identities-manager.c"
 }
 
 
@@ -1874,7 +1886,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        _tmp2_ = _tmp1_;
 #line 207 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp2_) {
-#line 1878 "moonshot-identities-manager.c"
+#line 1890 "moonshot-identities-manager.c"
                IdCard* _tmp3_ = NULL;
                IdCard* _tmp4_ = NULL;
 #line 208 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1889,7 +1901,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                result = retval;
 #line 209 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 1893 "moonshot-identities-manager.c"
+#line 1905 "moonshot-identities-manager.c"
        }
 #line 212 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = card;
@@ -1899,7 +1911,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        _tmp7_ = _tmp6_;
 #line 212 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp7_) {
-#line 1903 "moonshot-identities-manager.c"
+#line 1915 "moonshot-identities-manager.c"
                PasswordHashTable* _tmp8_ = NULL;
                IdCard* _tmp9_ = NULL;
                IIdentityCardStore* _tmp10_ = NULL;
@@ -1911,7 +1923,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                _tmp10_ = self->priv->store;
 #line 213 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_CachePassword (_tmp8_, _tmp9_, _tmp10_);
-#line 1915 "moonshot-identities-manager.c"
+#line 1927 "moonshot-identities-manager.c"
        } else {
                PasswordHashTable* _tmp11_ = NULL;
                IdCard* _tmp12_ = NULL;
@@ -1924,7 +1936,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                _tmp13_ = self->priv->store;
 #line 215 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_RemovePassword (_tmp11_, _tmp12_, _tmp13_);
-#line 1928 "moonshot-identities-manager.c"
+#line 1940 "moonshot-identities-manager.c"
        }
 #line 216 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp14_ = self->priv->store;
@@ -1942,7 +1954,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        result = retval;
 #line 218 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1946 "moonshot-identities-manager.c"
+#line 1958 "moonshot-identities-manager.c"
 }
 
 
@@ -1973,7 +1985,7 @@ static gboolean identity_manager_model_remove_card_internal (IdentityManagerMode
                result = FALSE;
 #line 223 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 1977 "moonshot-identities-manager.c"
+#line 1989 "moonshot-identities-manager.c"
        }
 #line 224 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp3_ = self->priv->password_table;
@@ -1993,7 +2005,7 @@ static gboolean identity_manager_model_remove_card_internal (IdentityManagerMode
        result = _tmp8_;
 #line 225 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1997 "moonshot-identities-manager.c"
+#line 2009 "moonshot-identities-manager.c"
 }
 
 
@@ -2017,13 +2029,13 @@ gboolean identity_manager_model_remove_card (IdentityManagerModel* self, IdCard*
                result = TRUE;
 #line 231 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 2021 "moonshot-identities-manager.c"
+#line 2033 "moonshot-identities-manager.c"
        }
 #line 233 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = FALSE;
 #line 233 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2027 "moonshot-identities-manager.c"
+#line 2039 "moonshot-identities-manager.c"
 }
 
 
@@ -2037,7 +2049,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
        _tmp1_ = self->priv->store;
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp1_ != NULL) {
-#line 2041 "moonshot-identities-manager.c"
+#line 2053 "moonshot-identities-manager.c"
                IIdentityCardStore* _tmp2_ = NULL;
                IIdentityCardStoreStoreType _tmp3_ = 0;
                IIdentityCardStoreStoreType _tmp4_ = 0;
@@ -2049,17 +2061,17 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                _tmp4_ = type;
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = _tmp3_ == _tmp4_;
-#line 2053 "moonshot-identities-manager.c"
+#line 2065 "moonshot-identities-manager.c"
        } else {
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = FALSE;
-#line 2057 "moonshot-identities-manager.c"
+#line 2069 "moonshot-identities-manager.c"
        }
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp0_) {
 #line 238 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return;
-#line 2063 "moonshot-identities-manager.c"
+#line 2075 "moonshot-identities-manager.c"
        }
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = type;
@@ -2067,7 +2079,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
        switch (_tmp5_) {
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                case IIDENTITY_CARD_STORE_STORE_TYPE_KEYRING:
-#line 2071 "moonshot-identities-manager.c"
+#line 2083 "moonshot-identities-manager.c"
                {
                        KeyringStore* _tmp6_ = NULL;
 #line 242 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -2078,12 +2090,12 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                        self->priv->store = (IIdentityCardStore*) _tmp6_;
 #line 243 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        break;
-#line 2082 "moonshot-identities-manager.c"
+#line 2094 "moonshot-identities-manager.c"
                }
                default:
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                case IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE:
-#line 2087 "moonshot-identities-manager.c"
+#line 2099 "moonshot-identities-manager.c"
                {
                        LocalFlatFileStore* _tmp7_ = NULL;
 #line 247 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -2094,7 +2106,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                        self->priv->store = (IIdentityCardStore*) _tmp7_;
 #line 248 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        break;
-#line 2098 "moonshot-identities-manager.c"
+#line 2110 "moonshot-identities-manager.c"
                }
        }
 }
@@ -2114,7 +2126,7 @@ IIdentityCardStoreStoreType identity_manager_model_get_store_type (IdentityManag
        result = _tmp1_;
 #line 253 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2118 "moonshot-identities-manager.c"
+#line 2130 "moonshot-identities-manager.c"
 }
 
 
@@ -2122,7 +2134,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
        gboolean result = FALSE;
 #line 256 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_return_val_if_fail (self != NULL, FALSE);
-#line 2126 "moonshot-identities-manager.c"
+#line 2138 "moonshot-identities-manager.c"
        {
                GeeLinkedList* _card_list = NULL;
                IIdentityCardStore* _tmp0_ = NULL;
@@ -2150,7 +2162,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                _card_index = -1;
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 2154 "moonshot-identities-manager.c"
+#line 2166 "moonshot-identities-manager.c"
                        gint _tmp5_ = 0;
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
@@ -2174,7 +2186,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                        if (!(_tmp6_ < _tmp7_)) {
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 2178 "moonshot-identities-manager.c"
+#line 2190 "moonshot-identities-manager.c"
                        }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp8_ = _card_list;
@@ -2192,7 +2204,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                        if (!_tmp14_) {
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp12_ = TRUE;
-#line 2196 "moonshot-identities-manager.c"
+#line 2208 "moonshot-identities-manager.c"
                        } else {
                                IdCard* _tmp15_ = NULL;
                                gchar** _tmp16_ = NULL;
@@ -2209,13 +2221,13 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _tmp17__length1 = _tmp16__length1;
 #line 261 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp12_ = _tmp17__length1 > 0;
-#line 2213 "moonshot-identities-manager.c"
+#line 2225 "moonshot-identities-manager.c"
                        }
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (_tmp12_) {
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp11_ = TRUE;
-#line 2219 "moonshot-identities-manager.c"
+#line 2231 "moonshot-identities-manager.c"
                        } else {
                                IdCard* _tmp18_ = NULL;
                                Rule* _tmp19_ = NULL;
@@ -2232,7 +2244,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _tmp20__length1 = _tmp19__length1;
 #line 262 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp11_ = _tmp20__length1 > 0;
-#line 2236 "moonshot-identities-manager.c"
+#line 2248 "moonshot-identities-manager.c"
                        }
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (_tmp11_) {
@@ -2244,28 +2256,28 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _g_object_unref0 (_card_list);
 #line 263 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                return result;
-#line 2248 "moonshot-identities-manager.c"
+#line 2260 "moonshot-identities-manager.c"
                        }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (card);
-#line 2252 "moonshot-identities-manager.c"
+#line 2264 "moonshot-identities-manager.c"
                }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_card_list);
-#line 2256 "moonshot-identities-manager.c"
+#line 2268 "moonshot-identities-manager.c"
        }
 #line 266 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = FALSE;
 #line 266 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2262 "moonshot-identities-manager.c"
+#line 2274 "moonshot-identities-manager.c"
 }
 
 
 static gpointer _identity_manager_app_ref0 (gpointer self) {
 #line 273 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self ? identity_manager_app_ref (self) : NULL;
-#line 2269 "moonshot-identities-manager.c"
+#line 2281 "moonshot-identities-manager.c"
 }
 
 
@@ -2299,14 +2311,14 @@ IdentityManagerModel* identity_manager_model_construct (GType object_type, Ident
        identity_manager_model_set_store_type (self, _tmp3_);
 #line 272 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self;
-#line 2303 "moonshot-identities-manager.c"
+#line 2315 "moonshot-identities-manager.c"
 }
 
 
 IdentityManagerModel* identity_manager_model_new (IdentityManagerApp* parent_app, IIdentityCardStoreStoreType store_type) {
 #line 272 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return identity_manager_model_construct (TYPE_IDENTITY_MANAGER_MODEL, parent_app, store_type);
-#line 2310 "moonshot-identities-manager.c"
+#line 2322 "moonshot-identities-manager.c"
 }
 
 
@@ -2319,14 +2331,14 @@ static void identity_manager_model_class_init (IdentityManagerModelClass * klass
        G_OBJECT_CLASS (klass)->finalize = identity_manager_model_finalize;
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_signal_new ("card_list_changed", TYPE_IDENTITY_MANAGER_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2323 "moonshot-identities-manager.c"
+#line 2335 "moonshot-identities-manager.c"
 }
 
 
 static void identity_manager_model_instance_init (IdentityManagerModel * self) {
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        self->priv = IDENTITY_MANAGER_MODEL_GET_PRIVATE (self);
-#line 2330 "moonshot-identities-manager.c"
+#line 2342 "moonshot-identities-manager.c"
 }
 
 
@@ -2342,7 +2354,7 @@ static void identity_manager_model_finalize (GObject* obj) {
        _identity_manager_app_unref0 (self->priv->parent);
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        G_OBJECT_CLASS (identity_manager_model_parent_class)->finalize (obj);
-#line 2346 "moonshot-identities-manager.c"
+#line 2358 "moonshot-identities-manager.c"
 }