Change the format of the .gss_eap_id
authorJavier Jardón <javier.jardon@codethink.co.uk>
Thu, 5 May 2011 14:43:16 +0000 (15:43 +0100)
committerJavier Jardón <javier.jardon@codethink.co.uk>
Thu, 5 May 2011 14:47:17 +0000 (15:47 +0100)
Now they looks like:

username@issuer
password

src/moonshot-identities-manager.vala
src/moonshot-window.vala

index 9b6f9c4..031e220 100644 (file)
@@ -101,9 +101,10 @@ class IdentitiesManager : Object {
             return null;
 
         id_card_data = text.split ("\n", 2);
-        id_card.issuer = "Issuer";
-        id_card.username = id_card_data[0];
         id_card.password = id_card_data[1];
+        id_card_data = id_card_data[0].split ("@", 2);
+        id_card.username = id_card_data[0];
+        id_card.issuer = id_card_data[1];
         id_card.services = {"email","jabber","irc"};
 
         var icon_theme = Gtk.IconTheme.get_default ();
@@ -127,7 +128,7 @@ class IdentitiesManager : Object {
         string text = "";
 
         if (id_card != null)
-            text = id_card.username + "\n" + id_card.password;
+            text = id_card.username + "@" + id_card.issuer + "\n" + id_card.password;
 
         var filename = Path.build_filename (Environment.get_home_dir (),
                                             ".gss_eap_id");
index af079ba..ecdf0d3 100644 (file)
@@ -163,7 +163,6 @@ class MainWindow : Window
         var id_card = new IdCard ();
 
         id_card.issuer = dialog.issuer;
-        id_card.issuer = "Issuer"; //FIXME
         if (id_card.issuer == "")
             id_card.issuer = "Issuer";
         id_card.username = dialog.username;