summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-06-14 03:37:43 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-06-14 03:37:43 +0200
commit2e2736036811d79c15d2c206904a01dec1294640 (patch)
tree937782cb6f5d5a12780a08261d98e3c86a732a34 /toolkit
parent8db9882b6882b8c88576a45bbabf475c5a33acfe (diff)
downloadUXP-2e2736036811d79c15d2c206904a01dec1294640.tar
UXP-2e2736036811d79c15d2c206904a01dec1294640.tar.gz
UXP-2e2736036811d79c15d2c206904a01dec1294640.tar.lz
UXP-2e2736036811d79c15d2c206904a01dec1294640.tar.xz
UXP-2e2736036811d79c15d2c206904a01dec1294640.zip
Revert "Add a next preprocessing to Troubleshot.jsm"
This reverts commit 6ac05db3d6f771a3a572a5701e0dbe88754f47b3.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/modules/Troubleshoot.jsm16
1 files changed, 7 insertions, 9 deletions
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 82cf7f86c..daf6d99e6 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -10,6 +10,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/AddonManager.jsm");
Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/AppConstants.jsm");
// We use a preferences whitelist to make sure we only show preferences that
// are useful for support and won't compromise the user's privacy. Note that
@@ -176,17 +177,16 @@ var dataProviders = {
let data = {
name: Services.appinfo.name,
osVersion: sysInfo.getProperty("name") + " " + sysInfo.getProperty("version"),
+ version: AppConstants.MOZ_APP_VERSION_DISPLAY,
buildID: Services.appinfo.appBuildID,
userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].
getService(Ci.nsIHttpProtocolHandler).
userAgent,
safeMode: Services.appinfo.inSafeMode,
};
-#expand let data.version = "__MOZ_APP_VERSION_DISPLAY__";
-#ifdef MOZ_UPDATER
- data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
-#endif
+ if (AppConstants.MOZ_UPDATER)
+ data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
#ifdef HAVE_64BIT_BUILD
data.versionArch = "64-bit";
@@ -356,11 +356,9 @@ var dataProviders = {
data.currentAudioBackend = winUtils.currentAudioBackend;
if (!data.numAcceleratedWindows && gfxInfo) {
-#ifdef XP_WIN
- let feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS;
-#else
- let feature = gfxInfo.FEATURE_OPENGL_LAYERS;
-#endif
+ let win = AppConstants.platform == "win";
+ let feature = win ? gfxInfo.FEATURE_DIRECT3D_9_LAYERS :
+ gfxInfo.FEATURE_OPENGL_LAYERS;
data.numAcceleratedWindowsMessage = statusMsgForFeature(feature);
}