source: pkg/vinnie/main/iceweasel/trunk/debian/patches/fixes/Fix-misalignments-in-help-command-line.patch @ 7516

Revision 7516, 4.5 KB checked in by alanbach-guest, 2 years ago (diff)
  • Added new iceweasel to Vinnie

  • browser/components/nsBrowserContentHandler.js 

    From: Mike Hommey <mh@glandium.org>
Date: Thu, 7 Jan 2010 10:46:43 +0100
Subject: Fix misalignments in --help command line

https://bugzilla.mozilla.org/show_bug.cgi?id=458631
---
 browser/components/nsBrowserContentHandler.js      |    2 +-
 .../components/shell/src/nsSetDefaultBrowser.js    |    2 +-
 toolkit/components/console/jsconsole-clhandler.js  |    2 +-
 toolkit/xre/nsAppRunner.cpp                        |   30 ++++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index b0f621f..765184d 100644
    a b var nsBrowserContentHandler = { 
    505505#endif 
    506506  }, 
    507507 
    508   helpInfo : "  -browser            Open a browser window.\n", 
     508  helpInfo : "  -browser           Open a browser window.\n", 
    509509 
    510510  /* nsIBrowserHandler */ 
    511511 

  • browser/components/shell/src/nsSetDefaultBrowser.js 

    diff --git a/browser/components/shell/src/nsSetDefaultBrowser.js b/browser/components/shell/src/nsSetDefaultBrowser.js
index e8ddfca..c818acf 100644
    a b nsSetDefaultBrowser.prototype = { 
    5555    } 
    5656  }, 
    5757 
    58   helpInfo: "  -setDefaultBrowser   Set this app as the default browser.\n", 
     58  helpInfo: "  -setDefaultBrowser Set this app as the default browser.\n", 
    5959 
    6060  classDescription: "Default Browser Cmdline Handler", 
    6161  contractID: "@mozilla.org/browser/default-browser-clh;1", 

  • toolkit/components/console/jsconsole-clhandler.js 

    diff --git a/toolkit/components/console/jsconsole-clhandler.js b/toolkit/components/console/jsconsole-clhandler.js
index dc1e97c..3fa6e09 100644
    a b jsConsoleHandler.prototype = { 
    6464      cmdLine.preventDefault = true; 
    6565  }, 
    6666 
    67   helpInfo : "  -jsconsole           Open the Error console.\n", 
     67  helpInfo : "  -jsconsole         Open the Error console.\n", 
    6868 
    6969  classDescription: "jsConsoleHandler", 
    7070  classID: Components.ID("{2cd0c310-e127-44d0-88fc-4435c9ab4d4b}"), 

  • toolkit/xre/nsAppRunner.cpp 

    diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 3b5a238..e6a3505 100644
    a b DumpHelp() 
    11911191 
    11921192#ifdef MOZ_X11 
    11931193  printf("X11 options\n" 
    1194          "\t--display=DISPLAY\t\tX display to use\n" 
    1195          "\t--sync\t\tMake X calls synchronous\n" 
    1196          "\t--no-xshm\t\tDon't use X shared memory extension\n" 
    1197          "\t--xim-preedit=STYLE\n" 
    1198          "\t--xim-status=STYLE\n"); 
     1194         "  --display=DISPLAY  X display to use\n" 
     1195         "  --sync             Make X calls synchronous\n" 
     1196         "  --no-xshm          Don't use X shared memory extension\n" 
     1197         "  --xim-preedit=STYLE\n" 
     1198         "  --xim-status=STYLE\n"); 
    11991199#endif 
    12001200#ifdef XP_UNIX 
    1201   printf("\t--g-fatal-warnings\t\tMake all warnings fatal\n" 
     1201  printf("  --g-fatal-warnings Make all warnings fatal\n" 
    12021202         "\n%s options\n", gAppData->name); 
    12031203#endif 
    12041204 
    1205   printf("\t-h or -help\t\tPrint this message.\n" 
    1206          "\t-v or -version\t\tPrint %s version.\n" 
    1207          "\t-P <profile>\t\tStart with <profile>.\n" 
    1208          "\t-migration\t\tStart with migration wizard.\n" 
    1209          "\t-ProfileManager\t\tStart with ProfileManager.\n" 
    1210          "\t-no-remote\t\tOpen new instance, not a new window in running instance.\n" 
    1211          "\t-UILocale <locale>\tStart with <locale> resources as UI Locale.\n" 
    1212          "\t-safe-mode\t\tDisables extensions and themes for this session.\n", gAppData->name); 
     1205  printf("  -h or -help        Print this message.\n" 
     1206         "  -v or -version     Print %s version.\n" 
     1207         "  -P <profile>       Start with <profile>.\n" 
     1208         "  -migration         Start with migration wizard.\n" 
     1209         "  -ProfileManager    Start with ProfileManager.\n" 
     1210         "  -no-remote         Open new instance, not a new window in running instance.\n" 
     1211         "  -UILocale <locale> Start with <locale> resources as UI Locale.\n" 
     1212         "  -safe-mode         Disables extensions and themes for this session.\n", gAppData->name); 
    12131213 
    12141214#if defined(XP_WIN) || defined(XP_OS2) 
    1215   printf("\t-console\t\tStart %s with a debugging console.\n", gAppData->name); 
     1215  printf("  -console           Start %s with a debugging console.\n", gAppData->name); 
    12161216#endif 
    12171217 
    12181218  // this works, but only after the components have registered.  so if you drop in a new command line handler, -help 
Note: See TracBrowser for help on using the repository browser.