From 4ae2e35bfbbbca202f481e465d62324bea0e6766 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 19 Sep 2007 10:03:39 +0000 Subject: (format_name_n_summary) factorize package name and summary formatting there --- Rpmdrake/formatting.pm | 7 ++++++- Rpmdrake/gui.pm | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'Rpmdrake') diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm index 700ef317..a5632aa0 100644 --- a/Rpmdrake/formatting.pm +++ b/Rpmdrake/formatting.pm @@ -33,7 +33,7 @@ use ugtk2 qw(escape_text_for_TextView_markup_format); use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(format_field format_header localtime2changelog my_fullname pkg2medium rpm_description split_fullname urpm_name); +our @EXPORT = qw(format_field format_header format_name_n_summary localtime2changelog my_fullname pkg2medium rpm_description split_fullname urpm_name); sub rpm_description { @@ -82,6 +82,11 @@ sub pkg2medium { #- encodings; but if a user has a so broken setup we can't do much anyway sub localtime2changelog { to_utf8(POSIX::strftime("%c", localtime($_[0]))) } +sub format_name_n_summary { + my ($name, $summary) = @_; + join("\n", '' . $name . '', escape_text_for_TextView_markup_format($summary)); +} + sub format_header { my ($str) = @_; '' . escape_text_for_TextView_markup_format($str) . ''; diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index d71d5068..32ec8c1f 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -237,8 +237,7 @@ sub add_node { if (is_a_package($leaf)) { my ($name, $version, $arch) = split_fullname($leaf); $iter = $w->{detail_list_model}->append_set([ $pkg_columns{text} => $leaf, - $pkg_columns{short_name} => '' . $name . '' . - "\n" . get_summary($leaf), + $pkg_columns{short_name} => format_name_n_summary($name, get_summary($leaf)), $pkg_columns{version} => $version, $pkg_columns{arch} => $arch, ]); -- cgit v1.2.1