vala

[moonshot-ui.git] / src / moonshot-local-flat-file-store.c

diff --git a/src/moonshot-local-flat-file-store.c b/src/moonshot-local-flat-file-store.c
index 9da6a28..933ffee 100644 (file)
--- a/src/moonshot-local-flat-file-store.c
+++ b/src/moonshot-local-flat-file-store.c
@@ -1,4 +1,4 @@
-/* moonshot-local-flat-file-store.c generated by valac 0.24.0, the Vala compiler
+/* moonshot-local-flat-file-store.c generated by valac 0.26.1, the Vala compiler
  * generated from moonshot-local-flat-file-store.vala, do not modify */
 
 /*
@@ -424,6 +424,29 @@ static void _vala_Rule_array_free (Rule* array, gint array_length) {
 }
 
 
+static gchar* string_strip (const gchar* self) {
+       gchar* result = NULL;
+       gchar* _result_ = NULL;
+       gchar* _tmp0_ = NULL;
+       const gchar* _tmp1_ = NULL;
+#line 1115 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       g_return_val_if_fail (self != NULL, NULL);
+#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       _tmp0_ = g_strdup (self);
+#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       _result_ = _tmp0_;
+#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       _tmp1_ = _result_;
+#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       g_strstrip (_tmp1_);
+#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       result = _result_;
+#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+       return result;
+#line 447 "moonshot-local-flat-file-store.c"
+}
+
+
 static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
        GeeLinkedList* _tmp0_ = NULL;
        GKeyFile* key_file = NULL;
@@ -462,7 +485,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
        _tmp4_ = g_build_filename (_tmp3_, LOCAL_FLAT_FILE_STORE_FILE_NAME, NULL);
 #line 73 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        filename = _tmp4_;
-#line 466 "moonshot-local-flat-file-store.c"
+#line 489 "moonshot-local-flat-file-store.c"
        {
                GKeyFile* _tmp5_ = NULL;
                const gchar* _tmp6_ = NULL;
@@ -473,8 +496,8 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 76 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                g_key_file_load_from_file (_tmp5_, _tmp6_, G_KEY_FILE_NONE, &_inner_error_);
 #line 76 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-               if (_inner_error_ != NULL) {
-#line 478 "moonshot-local-flat-file-store.c"
+               if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 501 "moonshot-local-flat-file-store.c"
                        goto __catch5_g_error;
                }
        }
@@ -507,11 +530,11 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                _g_key_file_free0 (key_file);
 #line 80 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                return;
-#line 511 "moonshot-local-flat-file-store.c"
+#line 534 "moonshot-local-flat-file-store.c"
        }
        __finally5:
 #line 75 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-       if (_inner_error_ != NULL) {
+       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 75 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _g_free0 (filename);
 #line 75 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -524,7 +547,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                g_clear_error (&_inner_error_);
 #line 75 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                return;
-#line 528 "moonshot-local-flat-file-store.c"
+#line 551 "moonshot-local-flat-file-store.c"
        }
 #line 83 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _tmp10_ = key_file;
@@ -540,7 +563,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
        _tmp13_ = identities_uris;
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _tmp13__length1 = identities_uris_length1;
-#line 544 "moonshot-local-flat-file-store.c"
+#line 567 "moonshot-local-flat-file-store.c"
        {
                gchar** identity_collection = NULL;
                gint identity_collection_length1 = 0;
@@ -552,14 +575,14 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                identity_collection_length1 = _tmp13__length1;
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                for (identity_it = 0; identity_it < _tmp13__length1; identity_it = identity_it + 1) {
-#line 556 "moonshot-local-flat-file-store.c"
+#line 579 "moonshot-local-flat-file-store.c"
                        gchar* _tmp14_ = NULL;
                        gchar* identity = NULL;
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp14_ = g_strdup (identity_collection[identity_it]);
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        identity = _tmp14_;
-#line 563 "moonshot-local-flat-file-store.c"
+#line 586 "moonshot-local-flat-file-store.c"
                        {
                                {
                                        IdCard* id_card = NULL;
@@ -609,28 +632,32 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                        TrustAnchor* _tmp105_ = NULL;
                                        TrustAnchor* _tmp106_ = NULL;
                                        gchar* _tmp107_ = NULL;
-                                       GKeyFile* _tmp108_ = NULL;
-                                       const gchar* _tmp109_ = NULL;
+                                       gchar* _tmp108_ = NULL;
+                                       gchar* _tmp109_ = NULL;
                                        gchar* _tmp110_ = NULL;
-                                       IdCard* _tmp111_ = NULL;
-                                       TrustAnchor* _tmp112_ = NULL;
-                                       TrustAnchor* _tmp113_ = NULL;
+                                       gchar* _tmp111_ = NULL;
+                                       GKeyFile* _tmp112_ = NULL;
+                                       const gchar* _tmp113_ = NULL;
                                        gchar* _tmp114_ = NULL;
-                                       GKeyFile* _tmp115_ = NULL;
-                                       const gchar* _tmp116_ = NULL;
-                                       gchar* _tmp117_ = NULL;
-                                       IdCard* _tmp118_ = NULL;
-                                       TrustAnchor* _tmp119_ = NULL;
-                                       TrustAnchor* _tmp120_ = NULL;
+                                       IdCard* _tmp115_ = NULL;
+                                       TrustAnchor* _tmp116_ = NULL;
+                                       TrustAnchor* _tmp117_ = NULL;
+                                       gchar* _tmp118_ = NULL;
+                                       GKeyFile* _tmp119_ = NULL;
+                                       const gchar* _tmp120_ = NULL;
                                        gchar* _tmp121_ = NULL;
-                                       GKeyFile* _tmp122_ = NULL;
-                                       const gchar* _tmp123_ = NULL;
-                                       gchar* _tmp124_ = NULL;
-                                       IdCard* _tmp125_ = NULL;
-                                       TrustAnchor* _tmp126_ = NULL;
-                                       TrustAnchor* _tmp127_ = NULL;
-                                       GeeLinkedList* _tmp128_ = NULL;
+                                       IdCard* _tmp122_ = NULL;
+                                       TrustAnchor* _tmp123_ = NULL;
+                                       TrustAnchor* _tmp124_ = NULL;
+                                       gchar* _tmp125_ = NULL;
+                                       GKeyFile* _tmp126_ = NULL;
+                                       const gchar* _tmp127_ = NULL;
+                                       gchar* _tmp128_ = NULL;
                                        IdCard* _tmp129_ = NULL;
+                                       TrustAnchor* _tmp130_ = NULL;
+                                       TrustAnchor* _tmp131_ = NULL;
+                                       GeeLinkedList* _tmp132_ = NULL;
+                                       IdCard* _tmp133_ = NULL;
 #line 86 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp15_ = id_card_new ();
 #line 86 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -644,10 +671,10 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp16_ = _tmp19_;
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 651 "moonshot-local-flat-file-store.c"
+#line 678 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -663,12 +690,12 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 89 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp21_ = _tmp24_;
 #line 89 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 89 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp16_);
 #line 89 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 672 "moonshot-local-flat-file-store.c"
+#line 699 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 89 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -684,14 +711,14 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp26_ = _tmp29_;
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp21_);
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp16_);
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 695 "moonshot-local-flat-file-store.c"
+#line 722 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 90 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -711,7 +738,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        __tmp31__size_ = _tmp31__length1;
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp26_);
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -720,7 +747,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 724 "moonshot-local-flat-file-store.c"
+#line 751 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 91 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -736,7 +763,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp37_ = _tmp40_;
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp31_ = (_vala_array_free (_tmp31_, _tmp31__length1, (GDestroyNotify) g_free), NULL);
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -747,7 +774,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 751 "moonshot-local-flat-file-store.c"
+#line 778 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 92 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -763,7 +790,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp42_ = _tmp45_;
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp37_);
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -776,12 +803,12 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 780 "moonshot-local-flat-file-store.c"
+#line 807 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        if (_tmp42_) {
-#line 785 "moonshot-local-flat-file-store.c"
+#line 812 "moonshot-local-flat-file-store.c"
                                                gchar* _tmp46_ = NULL;
                                                GKeyFile* _tmp47_ = NULL;
                                                const gchar* _tmp48_ = NULL;
@@ -798,7 +825,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp46_ = _tmp49_;
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               if (_inner_error_ != NULL) {
+                                               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_free0 (_tmp37_);
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -811,7 +838,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        _g_free0 (_tmp16_);
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_object_unref0 (id_card);
-#line 815 "moonshot-local-flat-file-store.c"
+#line 842 "moonshot-local-flat-file-store.c"
                                                        goto __catch6_g_error;
                                                }
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -828,7 +855,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp52_);
 #line 93 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp46_);
-#line 832 "moonshot-local-flat-file-store.c"
+#line 859 "moonshot-local-flat-file-store.c"
                                        } else {
                                                gboolean _tmp53_ = FALSE;
                                                IdCard* _tmp54_ = NULL;
@@ -843,7 +870,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _tmp56_ = _tmp55_;
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                if (_tmp56_ != NULL) {
-#line 847 "moonshot-local-flat-file-store.c"
+#line 874 "moonshot-local-flat-file-store.c"
                                                        IdCard* _tmp57_ = NULL;
                                                        const gchar* _tmp58_ = NULL;
                                                        const gchar* _tmp59_ = NULL;
@@ -855,17 +882,17 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        _tmp59_ = _tmp58_;
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _tmp53_ = g_strcmp0 (_tmp59_, "") != 0;
-#line 859 "moonshot-local-flat-file-store.c"
+#line 886 "moonshot-local-flat-file-store.c"
                                                } else {
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _tmp53_ = FALSE;
-#line 863 "moonshot-local-flat-file-store.c"
+#line 890 "moonshot-local-flat-file-store.c"
                                                }
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp60_ = id_card;
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                id_card_set_store_password (_tmp60_, _tmp53_);
-#line 869 "moonshot-local-flat-file-store.c"
+#line 896 "moonshot-local-flat-file-store.c"
                                        }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp63_ = key_file;
@@ -876,7 +903,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp62_ = _tmp65_;
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp37_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -889,12 +916,12 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 893 "moonshot-local-flat-file-store.c"
+#line 920 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        if (_tmp62_) {
-#line 898 "moonshot-local-flat-file-store.c"
+#line 925 "moonshot-local-flat-file-store.c"
                                                gboolean _tmp66_ = FALSE;
                                                GKeyFile* _tmp67_ = NULL;
                                                const gchar* _tmp68_ = NULL;
@@ -908,7 +935,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp66_ = _tmp69_;
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               if (_inner_error_ != NULL) {
+                                               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_free0 (_tmp37_);
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -921,20 +948,20 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        _g_free0 (_tmp16_);
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_object_unref0 (id_card);
-#line 925 "moonshot-local-flat-file-store.c"
+#line 952 "moonshot-local-flat-file-store.c"
                                                        goto __catch6_g_error;
                                                }
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp61_ = _tmp66_;
-#line 930 "moonshot-local-flat-file-store.c"
+#line 957 "moonshot-local-flat-file-store.c"
                                        } else {
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp61_ = FALSE;
-#line 934 "moonshot-local-flat-file-store.c"
+#line 961 "moonshot-local-flat-file-store.c"
                                        }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        if (_tmp61_) {
-#line 938 "moonshot-local-flat-file-store.c"
+#line 965 "moonshot-local-flat-file-store.c"
                                                gchar** rules_patterns = NULL;
                                                GKeyFile* _tmp70_ = NULL;
                                                const gchar* _tmp71_ = NULL;
@@ -966,7 +993,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 101 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _rules_patterns_size_ = rules_patterns_length1;
 #line 101 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               if (_inner_error_ != NULL) {
+                                               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 101 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_free0 (_tmp37_);
 #line 101 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -979,7 +1006,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        _g_free0 (_tmp16_);
 #line 101 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_object_unref0 (id_card);
-#line 983 "moonshot-local-flat-file-store.c"
+#line 1010 "moonshot-local-flat-file-store.c"
                                                        goto __catch6_g_error;
                                                }
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -995,7 +1022,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _rules_always_conf_size_ = rules_always_conf_length1;
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               if (_inner_error_ != NULL) {
+                                               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        rules_patterns = (_vala_array_free (rules_patterns, rules_patterns_length1, (GDestroyNotify) g_free), NULL);
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1010,7 +1037,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        _g_free0 (_tmp16_);
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _g_object_unref0 (id_card);
-#line 1014 "moonshot-local-flat-file-store.c"
+#line 1041 "moonshot-local-flat-file-store.c"
                                                        goto __catch6_g_error;
                                                }
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1023,7 +1050,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _tmp79__length1 = rules_always_conf_length1;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                if (_tmp78__length1 == _tmp79__length1) {
-#line 1027 "moonshot-local-flat-file-store.c"
+#line 1054 "moonshot-local-flat-file-store.c"
                                                        Rule* rules = NULL;
                                                        gchar** _tmp80_ = NULL;
                                                        gint _tmp80__length1 = 0;
@@ -1045,19 +1072,19 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        rules_length1 = _tmp80__length1;
 #line 105 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _rules_size_ = rules_length1;
-#line 1049 "moonshot-local-flat-file-store.c"
+#line 1076 "moonshot-local-flat-file-store.c"
                                                        {
                                                                gint i = 0;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                i = 0;
-#line 1054 "moonshot-local-flat-file-store.c"
+#line 1081 "moonshot-local-flat-file-store.c"
                                                                {
                                                                        gboolean _tmp82_ = FALSE;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                        _tmp82_ = TRUE;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                        while (TRUE) {
-#line 1061 "moonshot-local-flat-file-store.c"
+#line 1088 "moonshot-local-flat-file-store.c"
                                                                                gint _tmp84_ = 0;
                                                                                gchar** _tmp85_ = NULL;
                                                                                gint _tmp85__length1 = 0;
@@ -1078,13 +1105,13 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                                                Rule _tmp97_ = {0};
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                if (!_tmp82_) {
-#line 1082 "moonshot-local-flat-file-store.c"
+#line 1109 "moonshot-local-flat-file-store.c"
                                                                                        gint _tmp83_ = 0;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                        _tmp83_ = i;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                        i = _tmp83_ + 1;
-#line 1088 "moonshot-local-flat-file-store.c"
+#line 1115 "moonshot-local-flat-file-store.c"
                                                                                }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                _tmp82_ = FALSE;
@@ -1098,7 +1125,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                                                if (!(_tmp84_ < _tmp85__length1)) {
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                        break;
-#line 1102 "moonshot-local-flat-file-store.c"
+#line 1129 "moonshot-local-flat-file-store.c"
                                                                                }
 #line 107 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                _tmp86_ = rules;
@@ -1140,7 +1167,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                                                _tmp86_[_tmp87_] = _tmp96_;
 #line 107 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                                                _tmp97_ = _tmp86_[_tmp87_];
-#line 1144 "moonshot-local-flat-file-store.c"
+#line 1171 "moonshot-local-flat-file-store.c"
                                                                        }
                                                                }
                                                        }
@@ -1154,13 +1181,13 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                        id_card_set_rules (_tmp98_, _tmp99_, _tmp99__length1);
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        rules = (_vala_Rule_array_free (rules, rules_length1), NULL);
-#line 1158 "moonshot-local-flat-file-store.c"
+#line 1185 "moonshot-local-flat-file-store.c"
                                                }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                rules_always_conf = (_vala_array_free (rules_always_conf, rules_always_conf_length1, (GDestroyNotify) g_free), NULL);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                rules_patterns = (_vala_array_free (rules_patterns, rules_patterns_length1, (GDestroyNotify) g_free), NULL);
-#line 1164 "moonshot-local-flat-file-store.c"
+#line 1191 "moonshot-local-flat-file-store.c"
                                        }
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp101_ = key_file;
@@ -1171,7 +1198,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp100_ = _tmp103_;
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp37_);
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1184,7 +1211,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 1188 "moonshot-local-flat-file-store.c"
+#line 1215 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1194,17 +1221,31 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp106_ = _tmp105_;
 #line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       trust_anchor_set_ca_cert (_tmp106_, _tmp100_);
+                                       _tmp107_ = _tmp100_;
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _tmp100_ = NULL;
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _tmp108_ = _tmp107_;
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _tmp109_ = string_strip (_tmp108_);
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _tmp110_ = _tmp109_;
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       trust_anchor_set_ca_cert (_tmp106_, _tmp110_);
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _g_free0 (_tmp110_);
+#line 114 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+                                       _g_free0 (_tmp108_);
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp108_ = key_file;
+                                       _tmp112_ = key_file;
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp109_ = identity;
+                                       _tmp113_ = identity;
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp110_ = g_key_file_get_string (_tmp108_, _tmp109_, "Subject", &_inner_error_);
+                                       _tmp114_ = g_key_file_get_string (_tmp112_, _tmp113_, "Subject", &_inner_error_);
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp107_ = _tmp110_;
+                                       _tmp111_ = _tmp114_;
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp100_);
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1219,29 +1260,29 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 1223 "moonshot-local-flat-file-store.c"
+#line 1264 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp111_ = id_card;
+                                       _tmp115_ = id_card;
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp112_ = id_card_get_trust_anchor (_tmp111_);
+                                       _tmp116_ = id_card_get_trust_anchor (_tmp115_);
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp113_ = _tmp112_;
+                                       _tmp117_ = _tmp116_;
 #line 115 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       trust_anchor_set_subject (_tmp113_, _tmp107_);
+                                       trust_anchor_set_subject (_tmp117_, _tmp111_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp115_ = key_file;
+                                       _tmp119_ = key_file;
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp116_ = identity;
+                                       _tmp120_ = identity;
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp117_ = g_key_file_get_string (_tmp115_, _tmp116_, "SubjectAlt", &_inner_error_);
+                                       _tmp121_ = g_key_file_get_string (_tmp119_, _tmp120_, "SubjectAlt", &_inner_error_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp114_ = _tmp117_;
+                                       _tmp118_ = _tmp121_;
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               _g_free0 (_tmp107_);
+                                               _g_free0 (_tmp111_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp100_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1256,31 +1297,31 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 1260 "moonshot-local-flat-file-store.c"
+#line 1301 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp118_ = id_card;
+                                       _tmp122_ = id_card;
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp119_ = id_card_get_trust_anchor (_tmp118_);
+                                       _tmp123_ = id_card_get_trust_anchor (_tmp122_);
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp120_ = _tmp119_;
+                                       _tmp124_ = _tmp123_;
 #line 116 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       trust_anchor_set_subject_alt (_tmp120_, _tmp114_);
+                                       trust_anchor_set_subject_alt (_tmp124_, _tmp118_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp122_ = key_file;
+                                       _tmp126_ = key_file;
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp123_ = identity;
+                                       _tmp127_ = identity;
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp124_ = g_key_file_get_string (_tmp122_, _tmp123_, "ServerCert", &_inner_error_);
+                                       _tmp128_ = g_key_file_get_string (_tmp126_, _tmp127_, "ServerCert", &_inner_error_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp121_ = _tmp124_;
+                                       _tmp125_ = _tmp128_;
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       if (_inner_error_ != NULL) {
+                                       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               _g_free0 (_tmp114_);
+                                               _g_free0 (_tmp118_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                               _g_free0 (_tmp107_);
+                                               _g_free0 (_tmp111_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_free0 (_tmp100_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1295,29 +1336,29 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                                _g_free0 (_tmp16_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _g_object_unref0 (id_card);
-#line 1299 "moonshot-local-flat-file-store.c"
+#line 1340 "moonshot-local-flat-file-store.c"
                                                goto __catch6_g_error;
                                        }
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp125_ = id_card;
+                                       _tmp129_ = id_card;
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp126_ = id_card_get_trust_anchor (_tmp125_);
+                                       _tmp130_ = id_card_get_trust_anchor (_tmp129_);
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp127_ = _tmp126_;
+                                       _tmp131_ = _tmp130_;
 #line 117 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       trust_anchor_set_server_cert (_tmp127_, _tmp121_);
+                                       trust_anchor_set_server_cert (_tmp131_, _tmp125_);
 #line 119 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp128_ = self->priv->id_card_list;
+                                       _tmp132_ = self->priv->id_card_list;
 #line 119 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp129_ = id_card;
+                                       _tmp133_ = id_card;
 #line 119 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       gee_abstract_collection_add ((GeeAbstractCollection*) _tmp128_, _tmp129_);
+                                       gee_abstract_collection_add ((GeeAbstractCollection*) _tmp132_, _tmp133_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _g_free0 (_tmp121_);
+                                       _g_free0 (_tmp125_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _g_free0 (_tmp114_);
+                                       _g_free0 (_tmp118_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _g_free0 (_tmp107_);
+                                       _g_free0 (_tmp111_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _g_free0 (_tmp100_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1332,34 +1373,34 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                        _g_free0 (_tmp16_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _g_object_unref0 (id_card);
-#line 1336 "moonshot-local-flat-file-store.c"
+#line 1377 "moonshot-local-flat-file-store.c"
                                }
                                goto __finally6;
                                __catch6_g_error:
                                {
                                        GError* e = NULL;
-                                       FILE* _tmp130_ = NULL;
-                                       GError* _tmp131_ = NULL;
-                                       const gchar* _tmp132_ = NULL;
+                                       FILE* _tmp134_ = NULL;
+                                       GError* _tmp135_ = NULL;
+                                       const gchar* _tmp136_ = NULL;
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        e = _inner_error_;
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _inner_error_ = NULL;
 #line 122 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp130_ = stdout;
+                                       _tmp134_ = stdout;
 #line 122 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp131_ = e;
+                                       _tmp135_ = e;
 #line 122 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       _tmp132_ = _tmp131_->message;
+                                       _tmp136_ = _tmp135_->message;
 #line 122 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                                       fprintf (_tmp130_, "Error:  %s\n", _tmp132_);
+                                       fprintf (_tmp134_, "Error:  %s\n", _tmp136_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _g_error_free0 (e);
-#line 1359 "moonshot-local-flat-file-store.c"
+#line 1400 "moonshot-local-flat-file-store.c"
                                }
                                __finally6:
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-                               if (_inner_error_ != NULL) {
+                               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _g_free0 (identity);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -1376,11 +1417,11 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
                                        g_clear_error (&_inner_error_);
 #line 85 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        return;
-#line 1380 "moonshot-local-flat-file-store.c"
+#line 1421 "moonshot-local-flat-file-store.c"
                                }
 #line 84 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _g_free0 (identity);
-#line 1384 "moonshot-local-flat-file-store.c"
+#line 1425 "moonshot-local-flat-file-store.c"
                        }
                }
        }
@@ -1392,7 +1433,7 @@ static void local_flat_file_store_load_id_cards (LocalFlatFileStore* self) {
        _g_free0 (path);
 #line 69 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _g_key_file_free0 (key_file);
-#line 1396 "moonshot-local-flat-file-store.c"
+#line 1437 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -1419,19 +1460,19 @@ static gchar* local_flat_file_store_get_data_dir (LocalFlatFileStore* self) {
        _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS);
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        if (!_tmp3_) {
-#line 1423 "moonshot-local-flat-file-store.c"
+#line 1464 "moonshot-local-flat-file-store.c"
                const gchar* _tmp4_ = NULL;
 #line 133 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp4_ = path;
 #line 133 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                g_mkdir_with_parents (_tmp4_, 0700);
-#line 1429 "moonshot-local-flat-file-store.c"
+#line 1470 "moonshot-local-flat-file-store.c"
        }
 #line 135 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        result = path;
 #line 135 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        return result;
-#line 1435 "moonshot-local-flat-file-store.c"
+#line 1476 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -1442,17 +1483,17 @@ static Rule* _vala_array_dup1 (Rule* self, int length) {
        result = g_new0 (Rule, length);
 #line 142 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        for (i = 0; i < length; i++) {
-#line 1446 "moonshot-local-flat-file-store.c"
+#line 1487 "moonshot-local-flat-file-store.c"
                Rule _tmp0_ = {0};
 #line 142 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                rule_copy (&self[i], &_tmp0_);
 #line 142 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                result[i] = _tmp0_;
-#line 1452 "moonshot-local-flat-file-store.c"
+#line 1493 "moonshot-local-flat-file-store.c"
        }
 #line 142 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        return result;
-#line 1456 "moonshot-local-flat-file-store.c"
+#line 1497 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -1463,17 +1504,17 @@ static gchar** _vala_array_dup2 (gchar** self, int length) {
        result = g_new0 (gchar*, length + 1);
 #line 143 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        for (i = 0; i < length; i++) {
-#line 1467 "moonshot-local-flat-file-store.c"
+#line 1508 "moonshot-local-flat-file-store.c"
                gchar* _tmp0_ = NULL;
 #line 143 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp0_ = g_strdup (self[i]);
 #line 143 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                result[i] = _tmp0_;
-#line 1473 "moonshot-local-flat-file-store.c"
+#line 1514 "moonshot-local-flat-file-store.c"
        }
 #line 143 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        return result;
-#line 1477 "moonshot-local-flat-file-store.c"
+#line 1518 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -1489,41 +1530,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
        gint _tmp3__length1 = 0;
        guint8* _tmp4_ = NULL;
        gint _tmp4__length1 = 0;
-#line 1296 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1300 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 1297 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        res = (guint8*) self;
-#line 1297 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        res_length1 = -1;
-#line 1297 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _res_size_ = res_length1;
-#line 1298 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp0_ = strlen (self);
-#line 1298 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp1_ = _tmp0_;
-#line 1298 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        res_length1 = (gint) _tmp1_;
-#line 1298 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp2_ = res_length1;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp3_ = res;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp3__length1 = res_length1;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp4_ = _tmp3_;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        _tmp4__length1 = _tmp3__length1;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        if (result_length1) {
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
                *result_length1 = _tmp4__length1;
-#line 1521 "moonshot-local-flat-file-store.c"
+#line 1562 "moonshot-local-flat-file-store.c"
        }
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        result = _tmp4_;
-#line 1299 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
        return result;
-#line 1527 "moonshot-local-flat-file-store.c"
+#line 1568 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -1540,7 +1581,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
        _tmp0_ = g_key_file_new ();
 #line 139 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        key_file = _tmp0_;
-#line 1544 "moonshot-local-flat-file-store.c"
+#line 1585 "moonshot-local-flat-file-store.c"
        {
                GeeLinkedList* _id_card_list = NULL;
                GeeLinkedList* _tmp1_ = NULL;
@@ -1568,7 +1609,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                _id_card_index = -1;
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                while (TRUE) {
-#line 1572 "moonshot-local-flat-file-store.c"
+#line 1613 "moonshot-local-flat-file-store.c"
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
                        gint _tmp8_ = 0;
@@ -1711,7 +1752,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (!(_tmp7_ < _tmp8_)) {
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                break;
-#line 1715 "moonshot-local-flat-file-store.c"
+#line 1756 "moonshot-local-flat-file-store.c"
                        }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp9_ = _id_card_list;
@@ -1789,19 +1830,19 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        rules_always_conf_length1 = _tmp23__length1;
 #line 146 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _rules_always_conf_size_ = rules_always_conf_length1;
-#line 1793 "moonshot-local-flat-file-store.c"
+#line 1834 "moonshot-local-flat-file-store.c"
                        {
                                gint i = 0;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                i = 0;
-#line 1798 "moonshot-local-flat-file-store.c"
+#line 1839 "moonshot-local-flat-file-store.c"
                                {
                                        gboolean _tmp25_ = FALSE;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        _tmp25_ = TRUE;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                        while (TRUE) {
-#line 1805 "moonshot-local-flat-file-store.c"
+#line 1846 "moonshot-local-flat-file-store.c"
                                                gint _tmp27_ = 0;
                                                Rule* _tmp28_ = NULL;
                                                gint _tmp28__length1 = 0;
@@ -1827,13 +1868,13 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                                gchar* _tmp44_ = NULL;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                if (!_tmp25_) {
-#line 1831 "moonshot-local-flat-file-store.c"
+#line 1872 "moonshot-local-flat-file-store.c"
                                                        gint _tmp26_ = 0;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        _tmp26_ = i;
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        i = _tmp26_ + 1;
-#line 1837 "moonshot-local-flat-file-store.c"
+#line 1878 "moonshot-local-flat-file-store.c"
                                                }
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp25_ = FALSE;
@@ -1847,7 +1888,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                                if (!(_tmp27_ < _tmp28__length1)) {
 #line 148 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                        break;
-#line 1851 "moonshot-local-flat-file-store.c"
+#line 1892 "moonshot-local-flat-file-store.c"
                                                }
 #line 149 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp29_ = rules_patterns;
@@ -1897,7 +1938,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                                _tmp37_[_tmp38_] = _tmp43_;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                                _tmp44_ = _tmp37_[_tmp38_];
-#line 1901 "moonshot-local-flat-file-store.c"
+#line 1942 "moonshot-local-flat-file-store.c"
                                        }
                                }
                        }
@@ -1913,7 +1954,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp45_ == NULL) {
 #line 153 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp45_ = "";
-#line 1917 "moonshot-local-flat-file-store.c"
+#line 1958 "moonshot-local-flat-file-store.c"
                        }
 #line 153 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp49_ = key_file;
@@ -1937,7 +1978,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp53_ == NULL) {
 #line 154 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp53_ = "";
-#line 1941 "moonshot-local-flat-file-store.c"
+#line 1982 "moonshot-local-flat-file-store.c"
                        }
 #line 154 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp57_ = key_file;
@@ -1961,7 +2002,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp61_ == NULL) {
 #line 155 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp61_ = "";
-#line 1965 "moonshot-local-flat-file-store.c"
+#line 2006 "moonshot-local-flat-file-store.c"
                        }
 #line 155 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp65_ = key_file;
@@ -1981,7 +2022,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        _tmp72_ = _tmp71_;
 #line 156 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        if (_tmp72_) {
-#line 1985 "moonshot-local-flat-file-store.c"
+#line 2026 "moonshot-local-flat-file-store.c"
                                IdCard* _tmp73_ = NULL;
                                const gchar* _tmp74_ = NULL;
                                const gchar* _tmp75_ = NULL;
@@ -1993,15 +2034,15 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                _tmp75_ = _tmp74_;
 #line 156 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp69_ = _tmp75_ != NULL;
-#line 1997 "moonshot-local-flat-file-store.c"
+#line 2038 "moonshot-local-flat-file-store.c"
                        } else {
 #line 156 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp69_ = FALSE;
-#line 2001 "moonshot-local-flat-file-store.c"
+#line 2042 "moonshot-local-flat-file-store.c"
                        }
 #line 156 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        if (_tmp69_) {
-#line 2005 "moonshot-local-flat-file-store.c"
+#line 2046 "moonshot-local-flat-file-store.c"
                                GKeyFile* _tmp76_ = NULL;
                                IdCard* _tmp77_ = NULL;
                                const gchar* _tmp78_ = NULL;
@@ -2025,7 +2066,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                _tmp82_ = _tmp81_;
 #line 157 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                g_key_file_set_string (_tmp76_, _tmp79_, "Password", _tmp82_);
-#line 2029 "moonshot-local-flat-file-store.c"
+#line 2070 "moonshot-local-flat-file-store.c"
                        } else {
                                GKeyFile* _tmp83_ = NULL;
                                IdCard* _tmp84_ = NULL;
@@ -2041,7 +2082,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                _tmp86_ = _tmp85_;
 #line 159 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                g_key_file_set_string (_tmp83_, _tmp86_, "Password", "");
-#line 2045 "moonshot-local-flat-file-store.c"
+#line 2086 "moonshot-local-flat-file-store.c"
                        }
 #line 160 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp88_ = services;
@@ -2055,7 +2096,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        __tmp87__size_ = _tmp87__length1;
 #line 160 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        if (_tmp87_ == NULL) {
-#line 2059 "moonshot-local-flat-file-store.c"
+#line 2100 "moonshot-local-flat-file-store.c"
                                gchar** _tmp89_ = NULL;
                                gint _tmp89__length1 = 0;
 #line 160 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -2068,7 +2109,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                _tmp87__length1 = _tmp89__length1;
 #line 160 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                __tmp87__size_ = _tmp87__length1;
-#line 2072 "moonshot-local-flat-file-store.c"
+#line 2113 "moonshot-local-flat-file-store.c"
                        }
 #line 160 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp90_ = key_file;
@@ -2086,7 +2127,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        _tmp94__length1 = rules_length1;
 #line 162 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        if (_tmp94__length1 > 0) {
-#line 2090 "moonshot-local-flat-file-store.c"
+#line 2131 "moonshot-local-flat-file-store.c"
                                GKeyFile* _tmp95_ = NULL;
                                IdCard* _tmp96_ = NULL;
                                const gchar* _tmp97_ = NULL;
@@ -2127,7 +2168,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                                _tmp104__length1 = rules_always_conf_length1;
 #line 164 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                g_key_file_set_string_list (_tmp100_, _tmp103_, "Rules-AlwaysConfirm", (const gchar* const*) _tmp104_, _tmp104__length1);
-#line 2131 "moonshot-local-flat-file-store.c"
+#line 2172 "moonshot-local-flat-file-store.c"
                        }
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp106_ = id_card;
@@ -2139,11 +2180,11 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp108_) {
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp105_ = "yes";
-#line 2143 "moonshot-local-flat-file-store.c"
+#line 2184 "moonshot-local-flat-file-store.c"
                        } else {
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp105_ = "no";
-#line 2147 "moonshot-local-flat-file-store.c"
+#line 2188 "moonshot-local-flat-file-store.c"
                        }
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp109_ = key_file;
@@ -2171,7 +2212,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp113_ == NULL) {
 #line 169 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp113_ = "";
-#line 2175 "moonshot-local-flat-file-store.c"
+#line 2216 "moonshot-local-flat-file-store.c"
                        }
 #line 169 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp119_ = key_file;
@@ -2199,7 +2240,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp123_ == NULL) {
 #line 170 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp123_ = "";
-#line 2203 "moonshot-local-flat-file-store.c"
+#line 2244 "moonshot-local-flat-file-store.c"
                        }
 #line 170 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp129_ = key_file;
@@ -2227,7 +2268,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp133_ == NULL) {
 #line 171 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp133_ = "";
-#line 2231 "moonshot-local-flat-file-store.c"
+#line 2272 "moonshot-local-flat-file-store.c"
                        }
 #line 171 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp139_ = key_file;
@@ -2255,7 +2296,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        if (_tmp143_ == NULL) {
 #line 172 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                                _tmp143_ = "";
-#line 2259 "moonshot-local-flat-file-store.c"
+#line 2300 "moonshot-local-flat-file-store.c"
                        }
 #line 172 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _tmp149_ = key_file;
@@ -2279,11 +2320,11 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                        rules = (_vala_Rule_array_free (rules, rules_length1), NULL);
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_object_unref0 (id_card);
-#line 2283 "moonshot-local-flat-file-store.c"
+#line 2324 "moonshot-local-flat-file-store.c"
                }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _g_object_unref0 (_id_card_list);
-#line 2287 "moonshot-local-flat-file-store.c"
+#line 2328 "moonshot-local-flat-file-store.c"
        }
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _tmp153_ = key_file;
@@ -2291,7 +2332,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
        _tmp154_ = g_key_file_to_data (_tmp153_, NULL, NULL);
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        text = _tmp154_;
-#line 2295 "moonshot-local-flat-file-store.c"
+#line 2336 "moonshot-local-flat-file-store.c"
        {
                gchar* path = NULL;
                gchar* _tmp155_ = NULL;
@@ -2333,39 +2374,39 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                stream = _tmp161_;
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-               if (_inner_error_ != NULL) {
+               if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_object_unref0 (file);
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_free0 (filename);
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_free0 (path);
-#line 2344 "moonshot-local-flat-file-store.c"
+#line 2385 "moonshot-local-flat-file-store.c"
                        goto __catch7_g_error;
                }
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp162_ = stream;
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp163_ = text;
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp164_ = string_get_data (_tmp163_, &_tmp164__length1);
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp165_ = _tmp164_;
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _tmp165__length1 = _tmp164__length1;
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                g_output_stream_write ((GOutputStream*) _tmp162_, _tmp165_, (gsize) _tmp165__length1, NULL, &_inner_error_);
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-               if (_inner_error_ != NULL) {
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+               if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_object_unref0 (stream);
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_object_unref0 (file);
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_free0 (filename);
-#line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
+#line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                        _g_free0 (path);
-#line 2369 "moonshot-local-flat-file-store.c"
+#line 2410 "moonshot-local-flat-file-store.c"
                        goto __catch7_g_error;
                }
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -2376,7 +2417,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                _g_free0 (filename);
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _g_free0 (path);
-#line 2380 "moonshot-local-flat-file-store.c"
+#line 2421 "moonshot-local-flat-file-store.c"
        }
        goto __finally7;
        __catch7_g_error:
@@ -2399,11 +2440,11 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                fprintf (_tmp166_, "Error:  %s\n", _tmp168_);
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _g_error_free0 (e);
-#line 2403 "moonshot-local-flat-file-store.c"
+#line 2444 "moonshot-local-flat-file-store.c"
        }
        __finally7:
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-       if (_inner_error_ != NULL) {
+       if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                _g_free0 (text);
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -2414,7 +2455,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
                g_clear_error (&_inner_error_);
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
                return;
-#line 2418 "moonshot-local-flat-file-store.c"
+#line 2459 "moonshot-local-flat-file-store.c"
        }
 #line 193 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        local_flat_file_store_load_id_cards (self);
@@ -2422,7 +2463,7 @@ void local_flat_file_store_store_id_cards (LocalFlatFileStore* self) {
        _g_free0 (text);
 #line 138 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _g_key_file_free0 (key_file);
-#line 2426 "moonshot-local-flat-file-store.c"
+#line 2467 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -2432,7 +2473,7 @@ LocalFlatFileStore* local_flat_file_store_construct (GType object_type) {
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        self = (LocalFlatFileStore*) g_object_new (object_type, NULL);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
+       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _g_object_unref0 (self->priv->id_card_list);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
@@ -2441,14 +2482,14 @@ LocalFlatFileStore* local_flat_file_store_construct (GType object_type) {
        local_flat_file_store_load_id_cards (self);
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        return self;
-#line 2445 "moonshot-local-flat-file-store.c"
+#line 2486 "moonshot-local-flat-file-store.c"
 }
 
 
 LocalFlatFileStore* local_flat_file_store_new (void) {
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        return local_flat_file_store_construct (TYPE_LOCAL_FLAT_FILE_STORE);
-#line 2452 "moonshot-local-flat-file-store.c"
+#line 2493 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -2459,7 +2500,7 @@ static void local_flat_file_store_class_init (LocalFlatFileStoreClass * klass) {
        g_type_class_add_private (klass, sizeof (LocalFlatFileStorePrivate));
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        G_OBJECT_CLASS (klass)->finalize = local_flat_file_store_finalize;
-#line 2463 "moonshot-local-flat-file-store.c"
+#line 2504 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -2476,14 +2517,14 @@ static void local_flat_file_store_iidentity_card_store_interface_init (IIdentity
        iface->get_card_list = (GeeLinkedList* (*)(IIdentityCardStore*)) local_flat_file_store_real_get_card_list;
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        iface->get_store_type = (IIdentityCardStoreStoreType (*)(IIdentityCardStore*)) local_flat_file_store_real_get_store_type;
-#line 2480 "moonshot-local-flat-file-store.c"
+#line 2521 "moonshot-local-flat-file-store.c"
 }
 
 
 static void local_flat_file_store_instance_init (LocalFlatFileStore * self) {
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        self->priv = LOCAL_FLAT_FILE_STORE_GET_PRIVATE (self);
-#line 2487 "moonshot-local-flat-file-store.c"
+#line 2528 "moonshot-local-flat-file-store.c"
 }
 
 
@@ -2495,7 +2536,7 @@ static void local_flat_file_store_finalize (GObject* obj) {
        _g_object_unref0 (self->priv->id_card_list);
 #line 34 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        G_OBJECT_CLASS (local_flat_file_store_parent_class)->finalize (obj);
-#line 2499 "moonshot-local-flat-file-store.c"
+#line 2540 "moonshot-local-flat-file-store.c"
 }