summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/fs/partitioning_wizard.pm2
-rw-r--r--perl-install/install/steps_gtk.pm11
-rw-r--r--perl-install/services.pm2
4 files changed, 8 insertions, 9 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 8fa6ad83a..0dbcbe8a3 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -173,7 +173,7 @@ sub add_kind2notebook {
sub interactive_help() {
if ($::isInstall) {
- $in->display_help({ interactive_help_id => 'diskdrake' }, $w);
+ $in->display_help({ interactive_help_id => 'diskdrake' });
} else {
require run_program;
run_program::raw({ detach => 1 }, 'drakhelp', '--id', 'diskdrake');
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index f7e0a9002..12216bcf4 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -553,7 +553,7 @@ sub main {
if_($::isInstall,
[ gtknew('Install_Button',
text => N("Help"),
- clicked => sub { interactive::gtk::display_help($o, {interactive_help_id => 'doPartitionDisks' }, $mainw) }),
+ clicked => sub { interactive::gtk::display_help($o, {interactive_help_id => 'doPartitionDisks' }) }),
undef, 1 ]),
);
my $buttons_pack = $mainw->create_okcancel(N("Next"), undef, '', @more_buttons);
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index c52038fcb..b8e87ebaf 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -313,7 +313,7 @@ sub reallyChooseDesktop {
clicked => sub {
interactive::gtk::display_help(
$o,
- { interactive_help_id => 'chooseDesktop' }, $w);
+ { interactive_help_id => 'chooseDesktop' });
}), undef, 1 ])
]));
$w->main;
@@ -355,7 +355,7 @@ sub reallyChooseGroups {
0, Gtk2::HSeparator->new,
0, gtknew('HButtonBox', layout => 'edge', children_tight => [
gtknew('Install_Button', text => N("Help"), clicked => sub {
- interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }, $w) }),
+ interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }) }),
gtknew('Button', text => N("Unselect All"), clicked => sub { $_->set_active(0) foreach @entries }),
gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
]),
@@ -511,8 +511,7 @@ sub choosePackagesTree {
interactive_help => sub {
interactive::gtk::display_help($o,
{ interactive_help_id =>
- # FIXME: missing ref to upper window:
- 'choosePackagesTree' }, my $w) },
+ 'choosePackagesTree' }) },
ok => N("Install"),
cancel => N("Previous"),
@@ -732,7 +731,7 @@ sub summary_prompt {
};
$set_entry_labels->();
- my $help_sub = sub { interactive::gtk::display_help($o, { interactive_help_id => 'misc-params' }, $w) };
+ my $help_sub = sub { interactive::gtk::display_help($o, { interactive_help_id => 'misc-params' }) };
ugtk2::gtkadd($w->{window},
gtknew('VBox', spacing => 5, children => [
@@ -791,7 +790,7 @@ It will then continue from the hard disk drive and the packages will remain avai
),
0, gtknew('HButtonBox', layout => 'edge', children_tight => [
gtknew('Install_Button', text => N("Help"), clicked => sub {
- interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }, $w) }),
+ interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) }),
gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
]),
]),
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 2b73673d0..3ef2a0500 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -211,7 +211,7 @@ sub ask_ {
interactive_help => sub {
interactive::gtk::display_help($in,
{ interactive_help_id =>
- 'configureServices' }, $::main_window) },
+ 'configureServices' }) },
}) or return $l, $on_services; #- no change on cancel.
[ grep { $services{$_} } @$l ];
}