diff options
Diffstat (limited to 'gurpmi2')
| -rwxr-xr-x | gurpmi2 | 43 |
1 files changed, 20 insertions, 23 deletions
@@ -82,7 +82,6 @@ my @ask_unselect = $urpm->unselected_packages($state); ), \&do_install) : do_install(); - $mainw->show_all; Gtk2->main; @@ -95,28 +94,26 @@ sub configure_urpm { exit $_[0]; }; $urpm->{error} = sub { - my ($message) = @_; - my $nb_lines = split("\n", $message); - $message = Locale::gettext::iconv($message, undef, 'UTF-8'); - - - my $w; - if ($nb_lines > 30) { - $w = Gtk2::Dialog->new(N("Warning"), $mainw, [qw(modal destroy-with-parent)], N("Ok"), 'ok'); - $w->vbox->add(my $f = Gtk2::Frame->new); - my $sw = Gtk2::ScrolledWindow->new(undef, undef); - $f->add($sw); - $f->set_shadow_type('in'); - $sw->set_policy('automatic', 'automatic'); - my $text = Gtk2::TextView->new; - $sw->add($text); - $text->get_buffer->set_text($message); - $sw->set_border_width(2); - $_->show foreach $f, $sw, $text; - $w->set_size_request(400,400); - } else { - $w = Gtk2::MessageDialog->new($mainw, [qw(modal destroy-with-parent)], 'warning', 'ok', $message); - } + my ($message) = @_; + my $nb_lines = $message =~ tr/\n/\n/; + $message = Locale::gettext::iconv($message, undef, 'UTF-8'); + my $w; + if ($nb_lines > 30) { + $w = Gtk2::Dialog->new(N("Warning"), $mainw, [qw(modal destroy-with-parent)], N("Ok"), 'ok'); + $w->vbox->add(my $f = Gtk2::Frame->new); + my $sw = Gtk2::ScrolledWindow->new(undef, undef); + $f->add($sw); + $f->set_shadow_type('in'); + $sw->set_policy('automatic', 'automatic'); + my $text = Gtk2::TextView->new; + $sw->add($text); + $text->get_buffer->set_text($message); + $sw->set_border_width(2); + $_->show foreach $f, $sw, $text; + $w->set_size_request(400, 400); + } else { + $w = Gtk2::MessageDialog->new($mainw, [qw(modal destroy-with-parent)], 'warning', 'ok', $message); + } $w->run; $w->destroy; }; |