summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-27 07:45:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-27 07:45:19 +0000
commit8617c12236ef569f2be83f39b56909c31a579770 (patch)
tree1d0bde1232791ce34b314ae5eea835a102daf34b
parenta28a7bb583c457b1ed234bd408eb7d1734a2f226 (diff)
downloaddrakx-8617c12236ef569f2be83f39b56909c31a579770.tar
drakx-8617c12236ef569f2be83f39b56909c31a579770.tar.gz
drakx-8617c12236ef569f2be83f39b56909c31a579770.tar.bz2
drakx-8617c12236ef569f2be83f39b56909c31a579770.tar.xz
drakx-8617c12236ef569f2be83f39b56909c31a579770.zip
fix bad interaction between mcc & mousedrake.
interactive already take care of it through my_gtk...
-rwxr-xr-xperl-install/standalone/mousedrake5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 4ac16adcb..a8a1d2feb 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -23,7 +23,6 @@ if (!$::noauto) {
$mouse = $probed_mouse if !$mouse->{XMOUSETYPE} || !$probed_mouse->{unsafe};
}
-$::isEmbedded and kill 'USR2', $::CCPID;
if (!$mouse || !$::auto) {
$mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse");
if ($::isEmbedded && $in->isa('interactive::gtk')) {
@@ -39,7 +38,7 @@ if (!$mouse || !$::auto) {
sub { join '|', map { translate($_) } split '\|', $_[0] },
[ mouse::fullnames ],
$mouse->{type} . '|' . $mouse->{name});
- $name or $::isEmbedded ? do { kill('USR1', $::CCPID); goto begin } : $in->exit(0);
+ $in->exit(0);
my $mouse_chosen = mouse::fullname2mouse($name);
$mouse = $mouse_chosen if !($mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name});
@@ -61,5 +60,5 @@ if (!$mouse || !$::auto) {
mouse::write_conf($in, $mouse, 1);
system('service', 'gpm', 'restart') if -e '/var/lock/subsys/gpm';
-$::isEmbedded ? kill('USR1', $::CCPID) : $in->exit(0);
+$in->exit(0);
goto begin;