aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-28 15:06:20 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-28 15:06:20 +0000
commitd753985ee7c5fdd6f6b7d3d272badd1684c39ad6 (patch)
treed8ba2d26e06a26bf7c9eb2859f3f5d4133e14752
parenta06588e7ec546a96f811ea27668987cedd05b2b1 (diff)
downloadrpmdrake-d753985ee7c5fdd6f6b7d3d272badd1684c39ad6.tar
rpmdrake-d753985ee7c5fdd6f6b7d3d272badd1684c39ad6.tar.gz
rpmdrake-d753985ee7c5fdd6f6b7d3d272badd1684c39ad6.tar.bz2
rpmdrake-d753985ee7c5fdd6f6b7d3d272badd1684c39ad6.tar.xz
rpmdrake-d753985ee7c5fdd6f6b7d3d272badd1684c39ad6.zip
(format_pkg_simplifiedinfo) do display some data if only one field is not UTF-8 valid
-rw-r--r--Rpmdrake/gui.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index aef6170f..cdb0759b 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -76,8 +76,8 @@ sub format_pkg_simplifiedinfo {
# workaround gtk+ bug where GtkTextView wronly limit embedded widget size to bigger line's width (#25533):
"\x{200b} \x{feff}" . ' ' x 120,
if_($update_descr, # is it an update?
- format_field(N("Importance: ")) . escape_text_for_TextView_markup_format($descriptions->{$name}{importance}),
- format_field(N("Reason for update: ")) . escape_text_for_TextView_markup_format(rpm_description($descriptions->{$name}{pre})),
+ format_field(N("Importance: ")) . eval { escape_text_for_TextView_markup_format($descriptions->{$name}{importance}) },
+ format_field(N("Reason for update: ")) . eval { escape_text_for_TextView_markup_format(rpm_description($descriptions->{$name}{pre})) },
),
'')); # extra empty line
if ($update_descr) {
@@ -89,7 +89,7 @@ sub format_pkg_simplifiedinfo {
}
push @$s, @{ ugtk2::markup_to_TextView_format(join("\n",
- (escape_text_for_TextView_markup_format($pkgs->{$key}{description} || $descriptions->{$name}{description}) || '<i>' . N("No description") . '</i>')
+ (eval { escape_text_for_TextView_markup_format($pkgs->{$key}{description} || $descriptions->{$name}{description}) } || '<i>' . N("No description") . '</i>')
)) };
push @$s, [ "\n" ];
push @$s, [ gtkadd(gtkshow(my $exp0 = Gtk2::Expander->new(format_field(N("Details:")))),