From 4583221f1c292f2af8cd61958606277712e7b898 Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sat, 12 May 2012 15:00:43 +0200
Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch
 'origin/master'


From bf64240dc315ed4974769995716e93592f5010eb Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sat, 12 May 2012 15:16:53 +0200
Subject: [PATCH 2/3] SeaMonkey support without SMILE

---
 .../firefox/components/PdfStreamConverter.js  | 23 ++++++++++++++-----
 extensions/firefox/install.rdf                | 11 +++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js
index 49fd134ae..39376a791 100644
--- a/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@ -13,14 +13,25 @@ const PDFJS_EVENT_ID = 'pdf.js.message';
 const PDF_CONTENT_TYPE = 'application/pdf';
 const EXT_PREFIX = 'extensions.uriloader@pdf.js';
 const MAX_DATABASE_LENGTH = 4096;
+const FIREFOX_ID = '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}';
+const SEAMONKEY_ID = '{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}';
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
 Cu.import('resource://gre/modules/NetUtil.jsm');
 
-let privateBrowsing = Cc['@mozilla.org/privatebrowsing;1']
-                        .getService(Ci.nsIPrivateBrowsingService);
-let inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled;
+let appInfo = Cc['@mozilla.org/xre/app-info;1']
+                  .getService(Ci.nsIXULAppInfo);
+let privateBrowsing, inPrivateBrowsing;
+
+if (appInfo.ID === FIREFOX_ID) {
+  privateBrowsing = Cc['@mozilla.org/privatebrowsing;1']
+                          .getService(Ci.nsIPrivateBrowsingService);
+  inPrivateBrowsing = privateBrowsing.privateBrowsingEnabled;
+} else if (appInfo.ID === SEAMONKEY_ID) {
+  privateBrowsing = null;
+  inPrivateBrowsing = false;
+}
 
 function getBoolPref(pref, def) {
   try {
@@ -61,8 +72,8 @@ function getDOMWindow(aChannel) {
 
 // All the priviledged actions.
 function ChromeActions() {
-  this.inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled;
 }
+
 ChromeActions.prototype = {
   download: function(data) {
     let mimeService = Cc['@mozilla.org/mime;1'].getService(Ci.nsIMIMEService);
@@ -98,7 +109,7 @@ ChromeActions.prototype = {
     channel.asyncOpen(listener, null);
   },
   setDatabase: function(data) {
-    if (this.inPrivateBrowswing)
+    if (inPrivateBrowsing)
       return;
     // Protect against something sending tons of data to setDatabase.
     if (data.length > MAX_DATABASE_LENGTH)
@@ -106,7 +117,7 @@ ChromeActions.prototype = {
     setStringPref(EXT_PREFIX + '.database', data);
   },
   getDatabase: function() {
-    if (this.inPrivateBrowswing)
+    if (inPrivateBrowsing)
       return '{}';
     return getStringPref(EXT_PREFIX + '.database', '{}');
   },
diff --git a/extensions/firefox/install.rdf b/extensions/firefox/install.rdf
index d7eea9319..a8177834e 100644
--- a/extensions/firefox/install.rdf
+++ b/extensions/firefox/install.rdf
@@ -8,6 +8,8 @@
     <!-- PDFJS_LOCALIZED_METADATA -->
     <em:name>PDF Viewer</em:name>
     <em:version>PDFJSSCRIPT_VERSION</em:version>
+
+    <!-- Firefox -->
     <em:targetApplication>
       <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
@@ -15,6 +17,15 @@
        <em:maxVersion>14.0a1</em:maxVersion>
      </Description>
     </em:targetApplication>
+
+    <!-- SeaMonkey -->
+    <em:targetApplication>
+      <Description>
+       <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+       <em:minVersion>2.1.*</em:minVersion>
+       <em:maxVersion>2.9.*</em:maxVersion>
+     </Description>
+    </em:targetApplication>
     <em:bootstrap>true</em:bootstrap>
     <em:creator>Mozilla</em:creator>
     <em:description>Uses HTML5 to display PDF files directly in Firefox.</em:description>

From 7b5c69cac5aee49df014bd9e93aa559f8aed0e38 Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sat, 12 May 2012 19:42:27 +0200
Subject: [PATCH 3/3] Updated Firefox and SeaMonkey's maxVersion

---
 extensions/firefox/install.rdf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/firefox/install.rdf b/extensions/firefox/install.rdf
index a8177834e..a5094c19a 100644
--- a/extensions/firefox/install.rdf
+++ b/extensions/firefox/install.rdf
@@ -14,7 +14,7 @@
       <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
        <em:minVersion>6.0</em:minVersion>
-       <em:maxVersion>14.0a1</em:maxVersion>
+       <em:maxVersion>15.0a1</em:maxVersion>
      </Description>
     </em:targetApplication>
 
@@ -23,7 +23,7 @@
       <Description>
        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
        <em:minVersion>2.1.*</em:minVersion>
-       <em:maxVersion>2.9.*</em:maxVersion>
+       <em:maxVersion>2.12a1</em:maxVersion>
      </Description>
     </em:targetApplication>
     <em:bootstrap>true</em:bootstrap>