diff options
| author | Mystery Man <unknown@mandriva.org> | 2005-06-09 10:06:35 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2005-06-09 10:06:35 +0000 |
| commit | 1ccd3bc7282c17470266bed8cb0244a1b64d59fe (patch) | |
| tree | f4e880d019f33cf60f226be98398ea43a57878c6 /globetrotter/move.pm | |
| parent | 8ea9beca90c410e12593fedfb6e741dbdf8795d0 (diff) | |
| download | drakx-backup-do-not-use-1ccd3bc7282c17470266bed8cb0244a1b64d59fe.tar drakx-backup-do-not-use-1ccd3bc7282c17470266bed8cb0244a1b64d59fe.tar.gz drakx-backup-do-not-use-1ccd3bc7282c17470266bed8cb0244a1b64d59fe.tar.bz2 drakx-backup-do-not-use-1ccd3bc7282c17470266bed8cb0244a1b64d59fe.tar.xz drakx-backup-do-not-use-1ccd3bc7282c17470266bed8cb0244a1b64d59fe.zip | |
This commit was manufactured by cvs2svn to create tag 'MDK10-LACIE'.MDK10-LACIE
Diffstat (limited to 'globetrotter/move.pm')
| -rw-r--r-- | globetrotter/move.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/globetrotter/move.pm b/globetrotter/move.pm index c61f3649b..dfd1e6352 100644 --- a/globetrotter/move.pm +++ b/globetrotter/move.pm @@ -1,6 +1,6 @@ package move; # $Id$ -#- Copyright (c) 2004 MandrakeSoft +#- Copyright (c) 2004 Mandrakesoft #- #- This program is free software; you can redistribute it and/or modify #- it under the terms of the GNU General Public License as published by @@ -126,7 +126,7 @@ after_autoconf: eval { &$f() }; $o->ask_warn(N("Error"), [ N("An error occurred, but I don't know how to handle it nicely. -Continue at your own risk."), formatError($@) ]) if $@; +Continue at your own risk."). formatError($@) || $@ ]) if $@; } } system("killall XFree86"); @@ -146,7 +146,7 @@ sub automatic_xconf { local $o->{mouse}{device} = 'mouse'; require Xconfig::default; - $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings + $o->{raw_X} = Xconfig::default::configure(class_discard->new, { KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings require Xconfig::main; require class_discard; |