From 2edba96176172dfd32e77e7460e2523b936f81de Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Wed, 6 Oct 2010 14:10:21 -0400
Subject: [PATCH] support XULRunner 2.0

resolves issue309
---
 application.ini            | 2 +-
 chrome.manifest            | 1 +
 chrome/chrome.manifest     | 7 +++++++
 components/application.js  | 7 ++++---
 components/command-line.js | 7 ++++---
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 chrome.manifest

diff --git a/application.ini b/application.ini
index 205c940..0519b60 100644
--- a/application.ini
+++ b/application.ini
@@ -7,7 +7,7 @@ BuildID=git
 
 [Gecko]
 MinVersion=1.8.9999
-MaxVersion=1.9.*
+MaxVersion=2.*
 
 [XRE]
 EnableExtensionManager=1
diff --git a/chrome.manifest b/chrome.manifest
new file mode 100644
index 0000000..865d6a8
--- /dev/null
+++ b/chrome.manifest
@@ -0,0 +1 @@
+manifest chrome/chrome.manifest
diff --git a/chrome/chrome.manifest b/chrome/chrome.manifest
index 60f7bbc..8075a73 100644
--- a/chrome/chrome.manifest
+++ b/chrome/chrome.manifest
@@ -11,3 +11,10 @@ content  conkeror-test           file:../tests/
 locale   branding       en-US    file:../branding/
 
 override chrome://global/locale/netErrorApp.dtd chrome://conkeror-gui/locale/netError.dtd
+
+component {72a7eea7-a894-47ec-93a9-a7bc172cf1ac} ../components/application.js
+contract @conkeror.mozdev.org/application;1 {72a7eea7-a894-47ec-93a9-a7bc172cf1ac}
+
+component {0f4dd758-b55a-4386-a79c-8698642eac51} ../components/command-line.js
+contract @mozilla.org/commandlinehandler/general-startup;1?type=conkeror {0f4dd758-b55a-4386-a79c-8698642eac51}
+category command-line-handler y-conkeror @mozilla.org/commandlinehandler/general-startup;1?type=conkeror
diff --git a/components/application.js b/components/application.js
index 003c924..8d297bf 100644
--- a/components/application.js
+++ b/components/application.js
@@ -294,6 +294,7 @@ application.prototype = {
     contractID: "@conkeror.mozdev.org/application;1"
 };
 
-function NSGetModule (compMgr, fileSpec) {
-    return XPCOMUtils.generateModule([application]);
-}
+if (XPCOMUtils.generateNSGetFactory)
+    var NSGetFactory = XPCOMUtils.generateNSGetFactory([application]); //XULRunner 2.0
+else
+    var NSGetModule = XPCOMUtils.generateNSGetModule([application]);
diff --git a/components/command-line.js b/components/command-line.js
index 769bea8..308821e 100644
--- a/components/command-line.js
+++ b/components/command-line.js
@@ -32,6 +32,7 @@ cmdline.prototype = {
         }]
 };
 
-function NSGetModule (compMgr, fileSpec) {
-    return XPCOMUtils.generateModule([cmdline]);
-}
+if (XPCOMUtils.generateNSGetFactory)
+    var NSGetFactory = XPCOMUtils.generateNSGetFactory([cmdline]); //XULRunner 2.0
+else
+    var NSGetModule = XPCOMUtils.generateNSGetModule([cmdline]);
-- 
2.11.4.GIT