summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-06-26 22:33:57 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-26 22:35:02 +0200
commit84f76820747fad90a3ebcc5d9521256f6711a3c8 (patch)
tree73247dbcd20293400860937a0256d15a34445387
parent38acef524421072eb1e4ddb589335db44c268400 (diff)
downloaddrakx-84f76820747fad90a3ebcc5d9521256f6711a3c8.tar
drakx-84f76820747fad90a3ebcc5d9521256f6711a3c8.tar.gz
drakx-84f76820747fad90a3ebcc5d9521256f6711a3c8.tar.bz2
drakx-84f76820747fad90a3ebcc5d9521256f6711a3c8.tar.xz
drakx-84f76820747fad90a3ebcc5d9521256f6711a3c8.zip
fix installing fonts (Frédéric Buclin, mga#11849)
fallout from gtk2 -> gtk3 switch get_filenames() now returns an arrayref instead of a list.
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakfont4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d49be55fa..7afed2748 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- drakclock:
o fix crash on clicking "Cancel" after TZ selection (mga#13534)
o fix loosing TZ choice when canceling TZ selection (mga#13534)
+- drakfont:
+ o fix installing fonts (Frédéric Buclin, mga#11849)
Version 16.26.8 - 4 February 2014
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 68e4c67eb..ba9e17ab0 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -582,8 +582,8 @@ sub font_choice() {
$file_dialog->destroy;
return;
} elsif ($answer eq 'ok') {
- my @files = $file_dialog->get_filenames;
- foreach my $file_name (difference2(\@files, \@install)) {
+ my $files = $file_dialog->get_filenames;
+ foreach my $file_name (difference2($files, \@install)) {
push @install, $file_name;
$model->append_set(undef, [ 0 => $file_name ]);
}