diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-09-23 16:43:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-09-23 16:43:21 +0000 |
| commit | f987521c149c0a5b47a8893febcfaa1f92d4504a (patch) | |
| tree | 0a9d74238f8eb08b7a0dea8ac1d324686c4d4b7a | |
| parent | 3ff93a71aa3e4e021bad112d5ed8ad7246349fef (diff) | |
| download | drakx-backup-do-not-use-f987521c149c0a5b47a8893febcfaa1f92d4504a.tar drakx-backup-do-not-use-f987521c149c0a5b47a8893febcfaa1f92d4504a.tar.gz drakx-backup-do-not-use-f987521c149c0a5b47a8893febcfaa1f92d4504a.tar.bz2 drakx-backup-do-not-use-f987521c149c0a5b47a8893febcfaa1f92d4504a.tar.xz drakx-backup-do-not-use-f987521c149c0a5b47a8893febcfaa1f92d4504a.zip | |
(set_wm_hints_if_needed) extract if from finish-install so that it can reused elsewhere (eg: gurpmi.update)
| -rw-r--r-- | perl-install/any.pm | 7 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index a0d923780..071d23222 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1314,6 +1314,13 @@ sub running_window_manager() { undef; } +sub set_wm_hints_if_needed { + my ($o_in) = @_; + my $wm = any::running_window_manager(); + $o_in->{no_Window_Manager} = !$wm if $o_in; + $::set_dialog_hint = $wm eq 'drakx-matchbox-window-manager'; +} + sub ask_window_manager_to_logout { my ($wm) = @_; diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 6e4d844dc..694df3b9b 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -24,9 +24,7 @@ network::network::read_net_conf($net); $::isWizard = 1; my $in = 'interactive'->vnew; -my $wm = any::running_window_manager(); -$in->{no_Window_Manager} = !$wm; -$::set_dialog_hint = $wm eq 'drakx-matchbox-window-manager'; +any::set_wm_hints_if_needed($in); sub get_conf { my ($name) = @_; |