From 5eee3e01ee4d16ca4d1f0da072a7ee4f6bffe12c Mon Sep 17 00:00:00 2001
From: Andrew Van Tassel <andrew@andrewvantassel.com>
Date: Thu, 23 Aug 2018 17:10:13 -0600
Subject: [PATCH] Fixes for Thunderbird 60

---
 chrome/content/mailhops.js    | 6 ++----
 chrome/content/preferences.js | 2 --
 install.rdf                   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 109631c..43ca84d 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,7 +9,7 @@ var mailHops =
   msgURI:	null,
   isLoaded: false,
   options: {
-      'version':'MailHops Plugin 3.1.6',
+      'version':'MailHops Plugin 3.1.7',
       'lan':'en',
       'unit':'mi',
       'api_http':'https://',
@@ -37,8 +37,6 @@ mailHops.LOG = function(msg) {
 };
 
 mailHops.init = function() {
-  //import nativeJSON
-  var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
 
   //load preferences
   mailHops.loadPref();
@@ -332,7 +330,7 @@ mailHops.setupEventListener = function(){
 mailHops.registerObserver = function(){
   var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService( Components.interfaces.nsIPrefService ) ;
   mailHops._branch = prefService.getBranch( "mail.mailHops." ) ;
-  mailHops._branch.QueryInterface( Components.interfaces.nsIPrefBranchInternal ) ;
+  mailHops._branch.QueryInterface( Components.interfaces.nsIPrefBranch ) ;
   mailHops._branch.addObserver( "" , mailHops , false ) ;
 };
 
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 89e4d6c..c2f517a 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -162,7 +162,6 @@ var mailHopPreferences = {
 
     if(!!this.api_key && this.api_key.value != ''){
       var xmlhttp = new XMLHttpRequest();
-      var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
       var apiBase = this.api_http.value+this.api_host.value,
           accountURL = '/v2/accounts/?api_key='+this.api_key.value.trim(),
           api_key = this.api_key.value.trim(),
@@ -208,7 +207,6 @@ var mailHopPreferences = {
 
   TestConnection: function(){
  	var xmlhttp = new XMLHttpRequest();
- 	var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
  	var apiBase = this.api_http.value+this.api_host.value,
        lookupURL = '/v1/lookup/?healthcheck';
 
diff --git a/install.rdf b/install.rdf
index d2fddb0..340bc80 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>3.1.6</em:version>
+		<em:version>3.1.7</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>