← Back to branch summary

~ubuntu-branches/ubuntu/precise/firefox/precise-proposed

« back to all changes in this revision

Viewing changes to toolkit/components/printing/content/printdialog.js

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2005-12-02 20:16:18 UTC
  • Revision ID: james.westby@ubuntu.com-20051202201618-txu8o1sikp5e3by5
Tags: 1.4.99+1.5rc3.dfsg-1ubuntu4
* Applied mozilla-1.7.12-2.src.rpm's firefox-1.0-uriloader.patch
  which causes firefox to look first in the Gnome MIME handling registry
  (MIME handling is still very wrong).
* Disabled File / Import from main menu since it does not work at all
  (Ubuntu bugzilla 10339 still applies; patch brought forward).
* Displayed printer names no longer show `CUPS/' prefix.
  (Ubuntu bugzilla 11481 regressed; patch from Breezy enhanced).
* Print command fixed (again) to cope with spaces in printer names.
* Remove incorrect note about Pango from README.Debian.
* Re-fix-up localised startup URLs in en-US region.properties.
* Fix incorrect layout/sizing in Help / About box (a bit hacky).
* Re-forward-port patch to fix printer names with spaces.
* Remove all subdirectories '*.OBJ' during clean.

Show diffs side-by-side

added added

removed removed

Lines of Context:
toolkit/components/printing/content/printdialog.js
160
160
            if (strDefaultPrinterName == "")
161
161
               strDefaultPrinterName = printerNameStr;
162
162
 
163
 
            list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
 
163
            // We strip CUPS/ from the front of displayed printer
 
164
            // names.  It's a bit kludgy to do this here but at least
 
165
            // for Ubuntu all the printers come via CUPS.
 
166
            var printerLabelStr = printerNameStr.replace(RegExp("^CUPS/"), "");
 
167
 
 
168
            list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
164
169
          }
165
170
          if (strDefaultPrinterName != "") {
166
171
            this.listElement.removeAttribute("disabled");