diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-10-11 20:35:11 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-10-11 20:35:11 +0800 |
| commit | 4f28e61c24105cfa657fe35730cd0d3f1d4fcc63 (patch) | |
| tree | c8436d470578991a3bc61b2ca164d6a8fd563d13 /embed/mozilla | |
| parent | 96f1c46c7fdd0f85636bd30d3c7de89eccddabeb (diff) | |
| download | gsoc2013-epiphany-Release144.tar gsoc2013-epiphany-Release144.tar.gz gsoc2013-epiphany-Release144.tar.bz2 gsoc2013-epiphany-Release144.tar.lz gsoc2013-epiphany-Release144.tar.xz gsoc2013-epiphany-Release144.tar.zst gsoc2013-epiphany-Release144.zip | |
reviewed by: Christian Persch <chpe@cvs.gnome.org>Release144
2004-10-11 Marco Pesenti Gritti <marco@gnome.org>
reviewed by: Christian Persch <chpe@cvs.gnome.org>
=== Release 1.4.4 ===
* NEWS:
* configure.in:
Update for the release.
* embed/print-dialog.c: (get_printer_name),
(ephy_print_get_print_info):
Ensure the printer name is sane.
* lib/ephy-dialog.c: (set_combo_box_from_value):
Mark the value sane also when we fallback to
the first item in the list because there is not
matching item in the model.
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/EphyUtils.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp index c5e0bf666..89afedb40 100644 --- a/embed/mozilla/EphyUtils.cpp +++ b/embed/mozilla/EphyUtils.cpp @@ -174,9 +174,12 @@ EphyUtils::CollatePrintSettings (const EmbedPrintInfo *info, NS_CSTRING_ENCODING_UTF8, tmp); options->SetToFileName (tmp.get()); - NS_CStringToUTF16 (nsEmbedCString(info->printer), - NS_CSTRING_ENCODING_UTF8, tmp); - options->SetPrinterName (tmp.get()); + if (info->printer != NULL) + { + NS_CStringToUTF16 (nsEmbedCString(info->printer), + NS_CSTRING_ENCODING_UTF8, tmp); + options->SetPrinterName (tmp.get()); + } /** * Work around a mozilla bug where paper size & orientation are ignored |