From 8726e6dd60ee00abff6cb6a581f749158ca9dc7e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 03:46:25 +0100 Subject: prevent set_active() to be called with undef parameter --- perl-install/interactive/gtk.pm | 1 + perl-install/mygtk3.pm | 1 + perl-install/standalone/drakfont | 6 +++--- 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; -- cgit v1.2.1