- up to 25.0

[packages/firefox.git] / mozilla-firefox-middle_click_paste.patch

diff --git a/mozilla-firefox-middle_click_paste.patch b/mozilla-firefox-middle_click_paste.patch
index 179b0863fa16a9329cb69f78fcbfe2202e55f177..b32533852e1b0aa82dc82891853239895654b703 100644 (file)
--- a/mozilla-firefox-middle_click_paste.patch
+++ b/mozilla-firefox-middle_click_paste.patch
@@ -1,18 +1,19 @@
 --- iceweasel-13.0/mozilla/browser/base/content/browser.js.orig        2012-06-06 11:12:17.021562264 +0200
 +++ iceweasel-13.0/mozilla/browser/base/content/browser.js     2012-06-06 11:21:37.000000000 +0200
-@@ -5953,12 +5953,9 @@
+@@ -5231,12 +5231,9 @@
  
-   let mayInheritPrincipal = { value: false };
-   let url = getShortcutOrURI(clipboard, mayInheritPrincipal);
--  try {
--    makeURI(url);
--  } catch (ex) {
--    // Not a valid URI.
--    return;
--  }
-+  var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"].getService(Components.interfaces.nsIURIFixup);
-+  url = URIFixup.createFixupURI(url, 1).spec;
-+  // 1 is FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP
+   Task.spawn(function() {
+     let data = yield getShortcutOrURIAndPostData(clipboard);
+-    try {
+-      makeURI(data.url);
+-    } catch (ex) {
+-      // Not a valid URI.
+-      return;
+-    }
++    var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"].getService(Components.interfaces.nsIURIFixup);
++    data.url = URIFixup.createFixupURI(data.url, 1).spec;
++    // 1 is FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP
  
-   try {
-     addToUrlbarHistory(url);
+     try {
+       addToUrlbarHistory(data.url);
+