Skip to content

Commit

Permalink
Remove spurious error message
Browse files Browse the repository at this point in the history
Let's gather all Gecko error message cleanups into this patch.

DataReportingService:
https://bugzilla.mozilla.org/show_bug.cgi?id=1234522
  • Loading branch information
rainemak committed Jun 16, 2016
1 parent 55b9712 commit fc5bd20
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
@@ -0,0 +1,30 @@
From 76085a5c66b2027adc61a6a47d8a6efe254f72d8 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Thu, 16 Jun 2016 17:35:58 +0300
Subject: [PATCH 18/18] [xulrunner] Don't print errors from
DataReportingService

Will be removed in Gecko 46. See bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=1234522

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
services/datareporting/DataReportingService.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/datareporting/DataReportingService.js b/services/datareporting/DataReportingService.js
index 826a28c..c882334 100644
--- a/services/datareporting/DataReportingService.js
+++ b/services/datareporting/DataReportingService.js
@@ -226,7 +226,7 @@ DataReportingService.prototype = Object.freeze({
* The obtained instance may not be fully initialized.
*/
get healthReporter() {
- if (!this._prefs.get("service.enabled", true)) {
+ if (!this._prefs || !this._prefs.get("service.enabled", true)) {
return null;
}

--
2.7.4

2 changes: 2 additions & 0 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -59,6 +59,7 @@ Patch14: 0014-Revert-patchset-for-bug-1114594.-Contributes-JB32870.patch
Patch15: 0015-Add-transition-from-pinching-to-panning.patch
Patch16: 0016-rpm-Update-build-version.-Contributes-to-JB-35001.patch
Patch17: 0017-Bug-1253215-Initialize-RequestSyncService-only-if-it.patch
Patch18: 0018-xulrunner-Don-t-print-errors-from-DataReportingServi.patch
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(pango)
Expand Down Expand Up @@ -158,6 +159,7 @@ Tests and misc files for xulrunner.
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1

mkdir -p "%BUILD_DIR"
cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig
Expand Down

0 comments on commit fc5bd20

Please sign in to comment.