diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-08-07 18:01:22 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-08-07 18:01:22 +0000 |
| commit | 335750cf319ffb81c431334dff3b58b39c670f15 (patch) | |
| tree | 22b7717b919c40b906ffd057bc5deb386ae8b969 /perl-install | |
| parent | 0ca1aeec8743a6d16ba8305967d2bddff3ba0648 (diff) | |
| download | drakx-335750cf319ffb81c431334dff3b58b39c670f15.tar drakx-335750cf319ffb81c431334dff3b58b39c670f15.tar.gz drakx-335750cf319ffb81c431334dff3b58b39c670f15.tar.bz2 drakx-335750cf319ffb81c431334dff3b58b39c670f15.tar.xz drakx-335750cf319ffb81c431334dff3b58b39c670f15.zip | |
use gtk instead of X to focus window and revert workaround for the crash
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 4 | ||||
| -rwxr-xr-x | perl-install/install/install2 | 3 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 23 |
5 files changed, 7 insertions, 26 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index fee47ffbd..90ece88f8 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=12.41 +VERSION:=12.42 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 7cc6ceb3b..49a14c11d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,7 @@ the default one) (#52305) - do not crash when trying to create a partition on a device with no cylinder_size +- use gtk instead of X to focus window Version 12.40 - 22 July 2009 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 98110efa5..3b5b03c19 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +Version 12.42 - 7 Aug 2009 + +- use gtk instead of X to focus window and revert workaround + Version 12.41 - 7 Aug 2009 - do not crash when trying to create a partition on a device with diff --git a/perl-install/install/install2 b/perl-install/install/install2 index f9271b5c2..a080c0aef 100755 --- a/perl-install/install/install2 +++ b/perl-install/install/install2 @@ -27,9 +27,6 @@ use install::install2; $::testing = $ENV{PERL_INSTALL_TEST}; $::isStandalone = 0; -# Workaround crashes in async mode -unshift (@ARGV, "--sync"); - install::install2::main(@ARGV); c::_exit(0); diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index b09dc0144..b62f29eec 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -1217,9 +1217,7 @@ sub _create_Window { } }); - if ($no_Window_Manager) { - _force_keyboard_focus($w); - } + $w->present(); if ($::isInstall && !$::isStandalone) { require install::gtk; #- for perl_checker @@ -1247,25 +1245,6 @@ sub _create_Window { $w; } -my $current_window; -sub _force_keyboard_focus { - my ($w) = @_; - - sub _XSetInputFocus { - my ($w) = @_; - if ($current_window == $w) { - $w->window->XSetInputFocus; - } - 0; - } - - #- force keyboard focus instead of mouse focus - my $previous_current_window = $current_window; - $current_window = $w; - $w->signal_connect(expose_event => \&_XSetInputFocus); - $w->signal_connect(destroy => sub { $current_window = $previous_current_window }); -} - sub _find_imgfile { my ($name) = @_; |