summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/viewsource/content/viewSource-content.js3
-rw-r--r--toolkit/modules/UpdateUtils.jsm2
2 files changed, 2 insertions, 3 deletions
diff --git a/toolkit/components/viewsource/content/viewSource-content.js b/toolkit/components/viewsource/content/viewSource-content.js
index 70d23eaa4..bad90febf 100644
--- a/toolkit/components/viewsource/content/viewSource-content.js
+++ b/toolkit/components/viewsource/content/viewSource-content.js
@@ -128,8 +128,7 @@ var ViewSourceContent = {
let objects = msg.objects;
switch (msg.name) {
case "ViewSource:LoadSource":
- this.viewSource(data.URL, data.outerWindowID, data.lineNumber,
- data.shouldWrap);
+ this.viewSource(data.URL, data.outerWindowID, data.lineNumber);
break;
case "ViewSource:LoadSourceOriginal":
this.viewSourceOriginal(data.URL, objects.pageDescriptor, data.lineNumber,
diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
index fed7c7637..4e796a2da 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -31,9 +31,9 @@ this.UpdateUtils = {
* Whether or not to include the partner bits. Default: true.
*/
getUpdateChannel(aIncludePartners = true) {
+ let defaults = Services.prefs.getDefaultBranch(null);
let channel = defaults.getCharPref("app.update.channel",
AppConstants.MOZ_UPDATE_CHANNEL);
- let defaults = Services.prefs.getDefaultBranch(null);
if (aIncludePartners) {
try {