From 211221ec070321caf092fb8d35cd9b71e91e63b3 Mon Sep 17 00:00:00 2001 From: "mcsmurf%mcsmurf.de" Date: Wed, 30 May 2007 20:21:48 +0000 Subject: [PATCH] Firefox/Thunderbird shell code uses wrong attribute for help text - Bug 382115, r=gavin for browser/, r=mscott for mail/ git-svn-id: svn://10.0.0.236/trunk@227280 18797224-902f-48f8-a5cc-f745e15eee43 --- .../shell/src/nsSetDefaultBrowser.js | 2 +- .../mail/components/shell/nsSetDefaultMail.js | 72 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/mozilla/browser/components/shell/src/nsSetDefaultBrowser.js b/mozilla/browser/components/shell/src/nsSetDefaultBrowser.js index 5374bdb2b69..a362731e95f 100644 --- a/mozilla/browser/components/shell/src/nsSetDefaultBrowser.js +++ b/mozilla/browser/components/shell/src/nsSetDefaultBrowser.js @@ -64,7 +64,7 @@ nsSetDefaultBrowser.prototype = { } }, - helpText : " -setDefaultBrowser Set this app as the default browser.\n" + helpInfo : " -setDefaultBrowser Set this app as the default browser.\n" } // This Component's module and factory implementation. diff --git a/mozilla/mail/components/shell/nsSetDefaultMail.js b/mozilla/mail/components/shell/nsSetDefaultMail.js index 2fe24930a2b..804e6ce2d77 100644 --- a/mozilla/mail/components/shell/nsSetDefaultMail.js +++ b/mozilla/mail/components/shell/nsSetDefaultMail.js @@ -1,38 +1,38 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Default mail - * - * The Initial Developer of the Original Code is - * Scott MacGregor . - * Portions created by the Initial Developer are Copyright (C) 2006 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Default mail + * + * The Initial Developer of the Original Code is + * Scott MacGregor . + * Portions created by the Initial Developer are Copyright (C) 2006 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ /* This file implements the nsICommandLineHandler interface. @@ -64,7 +64,7 @@ nsSetDefaultMail.prototype = { } }, - helpText : " -setDefaultMail Set this app as the default mail client.\n" + helpInfo : " -setDefaultMail Set this app as the default mail client.\n" } const contractID = "@mozilla.org/mail/default-mail-clh;1";