Service list is now sent through the dbus service

diff --git a/src/moonshot-identities-manager.vala b/src/moonshot-identities-manager.vala
index 68f7ac9..5a76541 100644 (file)
--- a/src/moonshot-identities-manager.vala
+++ b/src/moonshot-identities-manager.vala
@@ -51,7 +51,7 @@ class IdentitiesManager : Object {
 
         foreach (IdCard id_card in this.id_card_list)
         {
-            /*string[] rules_patterns = new string[id_card.rules.length];
+            string[] rules_patterns = new string[id_card.rules.length];
             string[] rules_always_conf = new string[id_card.rules.length];
             
             for (int i=0; i<id_card.rules.length; i++)
@@ -59,13 +59,13 @@ class IdentitiesManager : Object {
               rules_patterns[i] = id_card.rules[i].pattern;
               rules_always_conf[i] = id_card.rules[i].always_confirm;
             }
-            */
+
             key_file.set_string (id_card.display_name, "Issuer", id_card.issuer ?? "");
             key_file.set_string (id_card.display_name, "DisplayName", id_card.display_name ?? "");
             key_file.set_string (id_card.display_name, "Username", id_card.username ?? "");
             key_file.set_string (id_card.display_name, "Password", id_card.password ?? "");
             key_file.set_string_list (id_card.display_name, "Services", id_card.services ?? {});
-            /*
+
             if (id_card.rules.length > 0)
             {
               key_file.set_string_list (id_card.display_name, "Rules-Patterns", rules_patterns);
@@ -76,7 +76,6 @@ class IdentitiesManager : Object {
             key_file.set_string (id_card.display_name, "Subject", id_card.trust_anchor.subject ?? "");
             key_file.set_string (id_card.display_name, "SubjectAlt", id_card.trust_anchor.subject_alt ?? "");
             key_file.set_string (id_card.display_name, "ServerCert", id_card.trust_anchor.server_cert ?? "");
-            */
         }
 
         var text = key_file.to_data (null);

diff --git a/src/moonshot-webp-parser.vala b/src/moonshot-webp-parser.vala
index a1cbdd4..9442684 100644 (file)
--- a/src/moonshot-webp-parser.vala
+++ b/src/moonshot-webp-parser.vala
@@ -299,15 +299,15 @@ namespace WebProvisioning
         dynamic DBus.Object bus = conn.get_object ("org.janet.Moonshot",
                                                    "/org/janet/moonshot",
                                                    "org.janet.Moonshot");
+
         Rule[] rules = {};
-        string[] services = {};
-        
+
         bus.install_id_card (card.display_name,
                              card.username,
                              card.password,
                              card.issuer,
                              rules,
-                             services,
+                             card.services,
                              card.trust_anchor.ca_cert,
                              card.trust_anchor.subject,
                              card.trust_anchor.subject_alt,

diff --git a/webprovisioning/sample.msht b/webprovisioning/sample.msht
index f679247..5f393ae 100644 (file)
--- a/webprovisioning/sample.msht
+++ b/webprovisioning/sample.msht
@@ -5,7 +5,7 @@
     <password>ENCRYPTEDPW</password>
     <realm>issuer name</realm>
     <services>
-      <service>xmpp@jabber.project-moonshot.org</service>
+      <service>xmpp@ja;bber.project-moonshot.org</service>
       <service>email@project-moonshot.org</service>
     </services>
     <selection-rules>