diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-12-15 09:14:01 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-12-15 09:14:01 +0000 |
commit | a4e6acb7d49063a117261eaf85f31fcfd281bfe7 (patch) | |
tree | 36b2cbf3eaf039df24ca47d72cf921a4a539d4ca /perl-install/install_steps_gtk.pm | |
parent | e26e8e595f1e0ba4b043e1225bfd34fb9387ee04 (diff) | |
download | drakx-a4e6acb7d49063a117261eaf85f31fcfd281bfe7.tar drakx-a4e6acb7d49063a117261eaf85f31fcfd281bfe7.tar.gz drakx-a4e6acb7d49063a117261eaf85f31fcfd281bfe7.tar.bz2 drakx-a4e6acb7d49063a117261eaf85f31fcfd281bfe7.tar.xz drakx-a4e6acb7d49063a117261eaf85f31fcfd281bfe7.zip |
- i had foolishly removed c::iconv whereas it was used still used by c::from_utf8 and c::to_utf8
- anyway, moving c::from_utf8 and c::to_utf8 to common::from_utf8 and common::to_utf8
- making them use Locale::gettext::iconv
- Locale::gettext::iconv transform undef into standard charset (1.05-2mdk)
- drop c::standard_charset (now unused)
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r-- | perl-install/install_steps_gtk.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 98888fbec..4c16cbcaf 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -301,7 +301,7 @@ sub choosePackagesTree { [ N("Version: "), $tag ], [ $p->version . '-' . $p->release . "\n" ], [ N("Size: "), $tag ], [ N("%d KB\n", $p->size / 1024) ], if_($imp, [ N("Importance: "), $tag ], [ "$imp\n" ]), - [ "\n" ], [ formatLines(c::from_utf8($p->description)) ] ]; + [ "\n" ], [ formatLines(common::from_utf8($p->description)) ] ]; }, toggle_nodes => sub { my $set_state = shift @_; @@ -502,7 +502,7 @@ sub installPackages { } elsif ($type eq 'open') { gtkval_modify(\$pkg_progress, 0); my $p = $packages->{depslist}[$id]; - mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, (split /\n/, c::from_utf8($p->summary))[0] || '')); + mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, (split /\n/, common::from_utf8($p->summary))[0] || '')); $current_total_size += $last_size; $last_size = $p->size; $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20; |