summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-12-02 13:35:53 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-12-02 13:35:53 +0000
commit28fcfc616838d65e34e61d73c3025255c564a6a8 (patch)
tree1b9e0261629adeb6c481863c179e9ec09e916576
parentc443c3872e7e8d621d54fb103613310555a785fb (diff)
downloaddrakx-backup-do-not-use-28fcfc616838d65e34e61d73c3025255c564a6a8.tar
drakx-backup-do-not-use-28fcfc616838d65e34e61d73c3025255c564a6a8.tar.gz
drakx-backup-do-not-use-28fcfc616838d65e34e61d73c3025255c564a6a8.tar.bz2
drakx-backup-do-not-use-28fcfc616838d65e34e61d73c3025255c564a6a8.tar.xz
drakx-backup-do-not-use-28fcfc616838d65e34e61d73c3025255c564a6a8.zip
make append option be usable as other ones
-rwxr-xr-xperl-install/standalone/logdrake2
-rw-r--r--perl-install/ugtk2.pm5
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 582f403c7..d4e7e11b6 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -360,7 +360,7 @@ sub logcolorize {
# log_output (Gtk2::TextView, [ [ ... ] ])
sub log_output {
- gtktext_insert($log_text, [ \@_ ], undef, 1);
+ gtktext_insert($log_text, [ \@_ ], { 'append' => 1 });
}
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 8db733c62..857ddcfd8 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -497,10 +497,10 @@ sub gtkcreate_pixbuf {
# [ 'third', { 'font' => 'Serif 15', ... } ],
# ... ]);
sub gtktext_insert {
- my ($textview, $t, $opts, $append) = @_;
+ my ($textview, $t, $opts) = @_;
if (ref($t) eq 'ARRAY') {
my $buffer = $textview->get_buffer;
- $buffer->set_text('', -1) unless $append;
+ $buffer->set_text('', -1) unless $opts->{append};
foreach my $token (@$t) {
my $c = $buffer->get_char_count;
$buffer->insert($buffer->get_end_iter, $token->[0], -1);
@@ -534,7 +534,6 @@ sub gtkfontinfo {
foreach (qw(ascent descent approximate_char_width approximate_digit_width)) {
no strict;
my $func = "get_$_";
- print "TOTO: ", $metrics->$func, "\n";;
$fontinfo{$_} = PANGO_PIXELS($metrics->$func);
}
$metrics->unref;