stdin.diff

--- bing.diff	2013-03-14 14:28:03.587392806 -0700
+++ msn.diff	2013-03-14 14:25:10.304828046 -0700
@@ -1,6 +1,6 @@
-diff -ur bing-orig/bootstrap.js bing/bootstrap.js
---- bing-orig/bootstrap.js	2011-10-18 15:21:50.000000000 -0700
-+++ bing/bootstrap.js	2013-02-27 14:47:44.000000000 -0800
+diff -ur msn-orig/bootstrap.js msn/bootstrap.js
+--- msn-orig/bootstrap.js	2012-09-13 06:58:42.000000000 -0700
++++ msn/bootstrap.js	2013-03-14 14:05:33.712624067 -0700
 @@ -70,6 +70,15 @@
    if (engine == null)
      return;
@@ -51,8 +51,17 @@
 +  }
  }
  
- // Open a new tab for the landing page and select it
-@@ -108,7 +141,7 @@
+ // Make sure the window has an app tab set to MSN
+@@ -106,7 +139,7 @@
+   });
+ 
+   // Always remove the MSN tab when uninstalling
+-  unload(function() gBrowser.removeTab(msnTab));
++  unload(function() gBrowser.removeTab(msnTab), window);
+ 
+   // No need to add!
+   if (msnTab != null)
+@@ -138,7 +171,7 @@
      });
  
      // Always remove the landing page when uninstalling
@@ -61,7 +70,7 @@
  
      // Add the landing page if not open yet
      if (landingTab == null)
-@@ -120,7 +153,7 @@
+@@ -154,7 +187,7 @@
    else {
      let {BrowserUI} = window;
      let tab = BrowserUI.newTab(LANDING_PAGE);
@@ -70,7 +79,15 @@
    }
  
    // Only show the landing page once
-@@ -141,11 +174,10 @@
+@@ -162,7 +195,6 @@
+ }
+ 
+ /**
+-
+  * Handle the add-on being activated on install/enable
+  */
+ function startup({id}, reason) AddonManager.getAddonByID(id, function(addon) {
+@@ -176,11 +208,10 @@
    addSearchEngine();
  
    // Change some prefs to custom search on install
@@ -83,17 +100,17 @@
 +  setPref(PREF_KEYWORD, SEARCH_KEYWORD_URL);
 +  setPref(PREF_HOME, SEARCH_HOME_URL);
 +  setPref(PREF_HOME_RESET, SEARCH_HOME_URL);
-   
-   // Open the landing page
-   watchWindows(showLandingPage);
-diff -ur bing-orig/install.rdf bing/install.rdf
---- bing-orig/install.rdf	2012-05-01 06:35:22.000000000 -0700
-+++ bing/install.rdf	2013-03-14 14:01:42.379854553 -0700
+ 
+   // Add an MSN app tab
+   watchWindows(ensureMsnAppTab);
+diff -ur msn-orig/install.rdf msn/install.rdf
+--- msn-orig/install.rdf	2012-11-07 02:00:38.000000000 -0800
++++ msn/install.rdf	2013-03-14 14:01:49.233171436 -0700
 @@ -7,7 +7,7 @@
-     <homepageURL>http://www.bing.com/</homepageURL>
-     <id>bing.search.for.firefox@firefox.bing</id>
-     <name>Bing Search for Firefox</name>
--    <version>1</version>
+     <homepageURL>http://www.msn.com/</homepageURL>
+     <id>firefoxmsn.full@microsoft.com</id>
+     <name>MSN for Firefox</name>
+-    <version>1.0</version>
 +    <version>1.1</version>
  
      <bootstrap>true</bootstrap>
@@ -102,19 +119,19 @@
        <r:Description>
          <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
          <minVersion>4.0</minVersion>
--        <maxVersion>15.0a1</maxVersion>
+-        <maxVersion>18.0</maxVersion>
 +        <maxVersion>19.*</maxVersion>
        </r:Description>
      </targetApplication>
    </r:Description>
-diff -ur bing-orig/scripts/helper.js bing/scripts/helper.js
---- bing-orig/scripts/helper.js	2011-10-18 15:18:59.000000000 -0700
-+++ bing/scripts/helper.js	2013-02-07 14:53:48.000000000 -0800
-@@ -45,6 +45,7 @@
+diff -ur msn-orig/scripts/helper.js msn/scripts/helper.js
+--- msn-orig/scripts/helper.js	2012-11-08 00:42:40.000000000 -0800
++++ msn/scripts/helper.js	2013-03-14 14:02:49.993024873 -0700
+@@ -44,6 +44,7 @@
  const PREF_HOME = "browser.startup.homepage";
  const PREF_HOME_RESET = "browser.startup.homepage_reset";
  const PREF_KEYWORD = "keyword.URL";
 +const PREF_ENGINENAME = "browser.search.defaultenginename";
  const SEARCH_DOMAIN = "www.bing.com";
  const SEARCH_ICON = "data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAVpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8ysf97zf%2B24%2F%2FF6f%2FF6f%2FF6f%2BK0%2F9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP%2BZ2P%2F%2F%2F%2F%2F%2F%2F%2F%2Fw%2Bf%2FF6f%2FF6f%2Fi9P%2F%2F%2F%2F%2F%2F%2F%2F%2FT7v9Bt%2F8Vpv8Vpv8Vpv8Vpv%2FT7v%2F%2F%2F%2F%2Fw%2Bf97zf8Vpv8Vpv8Vpv8Vpv9QvP%2FT7v%2F%2F%2F%2F%2Fw%2Bf9Bt%2F8Vpv8Vpv97zf%2F%2F%2F%2F%2F%2F%2F%2F9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP%2Fi9P%2F%2F%2F%2F%2Fi9P8Vpv8Vpv%2B24%2F%2F%2F%2F%2F%2Fi9P8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv%2BK0%2F%2F%2F%2F%2F%2F%2F%2F%2F8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2F%2F%2F%2F8krP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv%2Bn3v%2F%2F%2F%2F%2Fw%2Bf8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2F%2F%2F%2F%2Bn3v8krP8Vpv8Vpv8Vpv8Vpv8Vpv9tx%2F%2F%2F%2F%2F%2F%2F%2F%2F%2BZ2P8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2Fi9P%2BK0%2F9QvP9QvP9tx%2F%2FF6f%2F%2F%2F%2F%2F%2F%2F%2F%2Bn3v8Vpv8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2FT7v%2BZ2P%2Fi9P%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2F%2B24%2F9QvP8Vpv8Vpv8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2FF6f8Vpv8Vpv8krP9QvP9QvP9Bt%2F8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv%2FF6f%2F%2F%2F%2F%2FF6f8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv9Bt%2F9QvP9Bt%2F8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8AAHBsAABhdAAAbiAAAHJ0AABsaQAAdGkAACBDAABlbgAAUEEAAEVYAAAuQwAAOy4AAEU7AABBVAAAQ00AAC5W";
- const SEARCH_HOME_URL = "http://www.bing.com/?pc=MOZO";
+ const SEARCH_HOME_URL = "http://www.msn.com/?pc=MOZM";