summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-08 03:46:25 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-24 23:28:17 +0100
commit8726e6dd60ee00abff6cb6a581f749158ca9dc7e (patch)
tree73f8e102c2ac33a76cb02caaa729caf520590d14
parenta7f8805575a700e5ca8dfc962e8049eff33b71b4 (diff)
downloaddrakx-8726e6dd60ee00abff6cb6a581f749158ca9dc7e.tar
drakx-8726e6dd60ee00abff6cb6a581f749158ca9dc7e.tar.gz
drakx-8726e6dd60ee00abff6cb6a581f749158ca9dc7e.tar.bz2
drakx-8726e6dd60ee00abff6cb6a581f749158ca9dc7e.tar.xz
drakx-8726e6dd60ee00abff6cb6a581f749158ca9dc7e.zip
prevent set_active() to be called with undef parameter
-rw-r--r--perl-install/interactive/gtk.pm1
-rw-r--r--perl-install/mygtk3.pm1
-rwxr-xr-xperl-install/standalone/drakfont6
3 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index ac5653bd6..b233ac01d 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -396,6 +396,7 @@ sub create_widget {
$w = Gtk3::CheckButton->new_with_label($e->{text});
}
$w->signal_connect(clicked => $onchange->(sub { $w->get_active }));
+ ${$e->{val}} ||= 0;
$set = sub { $w->set_active($_[0]) };
$real_w = add_padding($w);
} elsif ($e->{type} eq 'only_label') {
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index 084d0cedf..094ca1a65 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -200,6 +200,7 @@ sub _gtk_any_Button {
$w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked};
} else {
if (my $active_ref = delete $opts->{active_ref}) {
+ $$active_ref ||= 0;
my $set = sub { $w->set_active($$active_ref) };
$w->signal_connect(toggled => sub {
gtkval_modify($active_ref, $w->get_active, $set);
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index f52f2a538..49a871b7c 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -100,9 +100,9 @@ $ugtk3::wm_icon = "drakfont";
my $xlsfonts = 0;
my $windows = 0;
my $replace;
-my $so = -f '/usr/bin/ooffice';
-my $gs = -f '/usr/bin/gs';
-my $abi = -f '/usr/bin/abiword';
+my $so = to_bool(-f '/usr/bin/ooffice');
+my $gs = to_bool(-f '/usr/bin/gs');
+my $abi = to_bool(-f '/usr/bin/abiword');
my $printer = 1;
my $mode = -1;
my @application;