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:33:57 +0200
commit6b2533b2540385390dc46596d3ef0587cdb720cb (patch)
tree62e2536d916720894551e5b04a26d5a2aa3f2078
parent0543d35bddd179a96f3ff88bd1103ca392087788 (diff)
downloaddrakx-6b2533b2540385390dc46596d3ef0587cdb720cb.tar
drakx-6b2533b2540385390dc46596d3ef0587cdb720cb.tar.gz
drakx-6b2533b2540385390dc46596d3ef0587cdb720cb.tar.bz2
drakx-6b2533b2540385390dc46596d3ef0587cdb720cb.tar.xz
drakx-6b2533b2540385390dc46596d3ef0587cdb720cb.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 c8de3696c..3941f696f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,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.33 - 18 June 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 ]);
}