Eliminating MakeJSONRPC calls and fixing multiple logins.

Fixes #113.

1 files changed, 1 insertions, 30 deletions

diff --git a/lib/main.js b/lib/main.js
index b7ac152..1d97e81 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -86,36 +86,6 @@ var messageHandler = exports.messageHandler = function messageHandler(
   case "OpenStringInPanel":
     libbz.openStringInNewPanel(msg.data);
     break;
-  case "MakeXMLRPCall":
-    // url, login, method, params, callback
-    libbz
-        .makeXMLRPCCall(msg.data.url, msg.data.login,
-            msg.data.method, msg.data.params, function(ret) {
-              worker.postMessage(new Message(msg.data.callRPC,
-                  ret));
-            });
-    break;
-  case "MakeJSONRPCall":
-    // url, login, method, params, callback
-    console.myDebug("messageHandler: msg = " + msg.toSource());
-    if (msg.data.login) {
-      libbz
-          .makeJSONRPCCallWithLogin(msg.data.url,
-              msg.data.method, msg.data.params, msg.data.login,
-              function(ret) {
-                worker.postMessage(new Message(msg.data.callRPC,
-                    ret));
-              });
-    }
-    else {
-      libbz
-          .makeJSONRPCCall(msg.data.url, msg.data.method,
-              msg.data.params, function(ret) {
-                worker.postMessage(new Message(msg.data.callRPC,
-                    ret));
-              });
-    }
-    break;
   // Needed because creating additional page-mods on remote bugzilla
   case "OpenBugUpstream":
     libbz.createUpstreamBug(msg.data.url, msg.data.subject,
@@ -133,6 +103,7 @@ var messageHandler = exports.messageHandler = function messageHandler(
 var contentScriptLibraries = [
     self.data.url('tweaks/urltest.js'),
     self.data.url("lib/util.js"),
+    self.data.url("lib/rpcutils.js"),
     self.data.url("lib/jumpNextBug.js"),
     self.data.url("lib/queries.js"),
     self.data.url("lib/collectingMetadata.js"),