From beaf7eb9f97f72836f3e261ebdd811b579d6e72a Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 18 Dec 2018 12:56:52 +0800
Subject: [PATCH] Uncommited changes synced

---
 NewBranch.bjs  |  5 +----
 NewBranch.vala | 17 ++++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/NewBranch.bjs b/NewBranch.bjs
index fea9da31..a5b845f2 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -210,14 +210,11 @@
        "bool vexpand" : true,
        "items" : [
         {
-         "listeners" : {
-          "authenticate" : "(auth) => {\n\tvar rs =  RooTicket.singleton();\t\n    auth.authenticate(new WebKit.Credential(rs.username, rs.password,WebKit.CredentialPersistence.FOR_SESSION));\n \n    return true;\n}"
-         },
          "id" : "view",
          "* pack" : "add",
          "xtype" : "WebView",
          "$ xns" : "WebKit",
-         "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t this.el.load_uri(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n}\n"
+         "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t\n\tvar rs =  RooTicket.singleton();\t\t\n\tvar uri = new WebKit.URIRequest(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n\tvar hd = uri.get_http_headers();\n\tvar authCode = Base64.encode (\"%s:%s\".printf(rs.username, rs.password).data);\n\thd.append(\"Authorization\", \"Basic %s\".printf(authCode));\n\t\n\t this.el.load_request(uri);\n}\n"
         }
        ]
       }
diff --git a/NewBranch.vala b/NewBranch.vala
index 7c3a9f9a..9183007d 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -893,14 +893,6 @@ public class NewBranch : Object
             // my vars (dec)
 
             // set gobject values
-
-            //listeners
-            this.el.authenticate.connect( (auth) => {
-            	var rs =  RooTicket.singleton();	
-                auth.authenticate(new WebKit.Credential(rs.username, rs.password,WebKit.CredentialPersistence.FOR_SESSION));
-             
-                return true;
-            });
         }
 
         // user defined functions
@@ -915,7 +907,14 @@ public class NewBranch : Object
         		_this.scrolled_window.el.show();
         		_this.el.resize(w, 800);
         	}
-        	 this.el.load_uri("https://roojs.com/admin.php/MTrack/View/" + tid);
+        	
+        	var rs =  RooTicket.singleton();		
+        	var uri = new WebKit.URIRequest("https://roojs.com/admin.php/MTrack/View/" + tid);
+        	var hd = uri.get_http_headers();
+        	var authCode = Base64.encode ("%s:%s".printf(rs.username, rs.password).data);
+        	hd.append("Authorization", "Basic %s".printf(authCode));
+        	
+        	 this.el.load_request(uri);
         }
     }
 
-- 
2.39.2