wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-29 18:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove appConstants usage from Troubleshoot.jsm (follow up)

Browse source 
Tags:
#65
#494 (follow up)
This commit is contained in:
janekptacijarabaci 2018-06-14 03:42:25 +02:00 • committed by Roy Tam
commit 358cb3e504
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
toolkit/modules/Troubleshoot.jsm
View file

@ -10,7 +10,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/AddonManager.jsm"); Cu.import("resource://gre/modules/AddonManager.jsm");
Cu.import("resource://gre/modules/Services.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 // 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 // are useful for support and won't compromise the user's privacy. Note that
@ -177,16 +176,17 @@ var dataProviders = {
let data = { let data = {
name: Services.appinfo.name, name: Services.appinfo.name,
osVersion: sysInfo.getProperty("name") + " " + sysInfo.getProperty("version"), osVersion: sysInfo.getProperty("name") + " " + sysInfo.getProperty("version"),
version: AppConstants.MOZ_APP_VERSION_DISPLAY,
buildID: Services.appinfo.appBuildID, buildID: Services.appinfo.appBuildID,
userAgent: Cc["@mozilla.org/network/protocol;1?name=http"]. userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].
getService(Ci.nsIHttpProtocolHandler). getService(Ci.nsIHttpProtocolHandler).
userAgent, userAgent,
safeMode: Services.appinfo.inSafeMode, safeMode: Services.appinfo.inSafeMode,
}; };
#expand data.version = "__MOZ_APP_VERSION_DISPLAY__";
if (AppConstants.MOZ_UPDATER) #ifdef MOZ_UPDATER
data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel; data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
#endif
#ifdef HAVE_64BIT_BUILD #ifdef HAVE_64BIT_BUILD
data.versionArch = "64-bit"; data.versionArch = "64-bit";
@ -356,9 +356,11 @@ var dataProviders = {
data.currentAudioBackend = winUtils.currentAudioBackend; data.currentAudioBackend = winUtils.currentAudioBackend;
if (!data.numAcceleratedWindows && gfxInfo) { if (!data.numAcceleratedWindows && gfxInfo) {
let win = AppConstants.platform == "win"; #ifdef XP_WIN
let feature = win ? gfxInfo.FEATURE_DIRECT3D_9_LAYERS : let feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS;
gfxInfo.FEATURE_OPENGL_LAYERS; #else
let feature = gfxInfo.FEATURE_OPENGL_LAYERS;
#endif
data.numAcceleratedWindowsMessage = statusMsgForFeature(feature); data.numAcceleratedWindowsMessage = statusMsgForFeature(feature);
} }