[Pkg-mozext-commits] [downthemall] 04/04: Refresh patches

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch wip
in repository downthemall.

commit 3a20de6be3fde256d6572817e98c0f9dfc218882
Author: David Prévot <david at tilapin.org>
Date:   Fri Apr 1 10:30:20 2016 -0400

    Refresh patches
---
 ...001-Remove-check-for-available-disk-space.patch | 34 ++++++++--------------
 ...display-user-tracking-screen-at-first-run.patch | 26 ++++++++---------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/debian/patches/0001-Remove-check-for-available-disk-space.patch b/debian/patches/0001-Remove-check-for-available-disk-space.patch
index 800ae5a..232730b 100644
--- a/debian/patches/0001-Remove-check-for-available-disk-space.patch
+++ b/debian/patches/0001-Remove-check-for-available-disk-space.patch
@@ -4,33 +4,28 @@ Subject: Remove check for available disk space
 
 It does not work, at least on some systems.
 ---
- .../chrome.jar!/content/common/internalFunctions.js  | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ chrome/content/common/internalFunctions.js | 10 ----------
+ 1 file changed, 10 deletions(-)
 
-diff --git a/chrome/chrome.jar!/content/common/internalFunctions.js b/chrome/chrome.jar!/content/common/internalFunctions.js
-index 412ace4..a7cff0e 100644
---- a/chrome/chrome.jar!/content/common/internalFunctions.js
-+++ b/chrome/chrome.jar!/content/common/internalFunctions.js
-@@ -130,13 +130,13 @@ var Utils = {
- 				parent = parent.QueryInterface(Ci.nsILocalFile);
+diff --git a/chrome/content/common/internalFunctions.js b/chrome/content/common/internalFunctions.js
+index 32def54..578faf8 100644
+--- a/chrome/content/common/internalFunctions.js
++++ b/chrome/content/common/internalFunctions.js
+@@ -183,13 +183,8 @@ var Utils = {
+ 				pn = pn.QueryInterface(Ci.nsIFile);
  				// we look for a directory that is writable and has some disk-space
- 				if (parent.isDirectory() && parent.isReadable() && parent.isWritable()) {
+ 				if (pn.isDirectory() && pn.isReadable() && pn.isWritable()) {
 -					try {
--						return parent.diskSpaceAvailable ? directory : false;
+-						return pn.diskSpaceAvailable ? directory : false;
 -					}
 -					catch (ex) {
-+					//try {
-+					//	return parent.diskSpaceAvailable ? directory : false;
-+					//}
-+					//catch (ex) {
  						// Solaris compat: #889
  						return directory;
 -					}
-+					//}
  				}
  			}
  		}
-@@ -157,14 +157,14 @@ var Utils = {
+@@ -210,14 +205,9 @@ var Utils = {
  	getFreeDisk: function(file) {
  		while (file) {
  			if (file.exists() && file.isDirectory()) {
@@ -38,15 +33,10 @@ index 412ace4..a7cff0e 100644
 -					return file.diskSpaceAvailable;
 -				}
 -				catch (ex) {
-+				//try {
-+				//	return file.diskSpaceAvailable;
-+				//}
-+				//catch (ex) {
  					// Solaris compat: #889
  					// As we cannot get a correct value simply return max int64_t
  					return 9223372036854775807;
--				}					
-+				//}				
+-				}
  			}
  			file = file.parent;
  		}
diff --git a/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch b/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
index 391764f..363cc2d 100644
--- a/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
+++ b/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
@@ -3,18 +3,18 @@ Date: Fri, 1 Apr 2016 09:57:27 -0400
 Subject: =?utf-8?q?Don=E2=80=99t_display_user_tracking_screen_at_first_run?=
 
 ---
- chrome/chrome.jar!/content/integration/elements.js | 1 -
+ modules/main.js | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/chrome/chrome.jar!/content/integration/elements.js b/chrome/chrome.jar!/content/integration/elements.js
-index 8595fed..5bbfbc7 100644
---- a/chrome/chrome.jar!/content/integration/elements.js
-+++ b/chrome/chrome.jar!/content/integration/elements.js
-@@ -1563,7 +1563,6 @@
- 				return;
- 			}
- 			if (Version.showAbout === true) {
--				openAbout();
- 				return;
- 			}
- 		}
+diff --git a/modules/main.js b/modules/main.js
+index a995331..fde38f7 100644
+--- a/modules/main.js
++++ b/modules/main.js
+@@ -477,7 +477,6 @@ function registerOverlays() {
+ 						return;
+ 					}
+ 					if (Version.showAbout) {
+-						openAbout();
+ 						return;
+ 					}
+ 				}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/downthemall.git