summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-08-02 09:39:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-08-02 09:39:31 +0000
commit6129b1e7588e6f24f881ee9f0c0a39b42f426501 (patch)
tree2604260454f42c9edef57fd92f7aa28181e75ab1
parent153b97596a3fd53f5a17f14d403154614c0139a6 (diff)
downloadcontrol-center-6129b1e7588e6f24f881ee9f0c0a39b42f426501.tar
control-center-6129b1e7588e6f24f881ee9f0c0a39b42f426501.tar.gz
control-center-6129b1e7588e6f24f881ee9f0c0a39b42f426501.tar.bz2
control-center-6129b1e7588e6f24f881ee9f0c0a39b42f426501.tar.xz
control-center-6129b1e7588e6f24f881ee9f0c0a39b42f426501.zip
- fixes for strict mode
- add userdrake - kill dead code - simplify compute_exec_string()
-rwxr-xr-xcontrol-center7
1 files changed, 3 insertions, 4 deletions
diff --git a/control-center b/control-center
index 20add436..c59cb958 100755
--- a/control-center
+++ b/control-center
@@ -40,7 +40,7 @@ Gtk->set_locale;
use Config;
use POSIX;
-$in = 'interactive'->vnew('su', 'default');
+my $in = 'interactive'->vnew('su', 'default');
#$in->do_pkgs->install('sane-frontends');
@@ -94,6 +94,7 @@ my $exec_hash =
_("Mouse") => [ "mousedrake", "$_sbindir/mousedrake", 1 ],
_("Printer") => [ "printerdrake", "$_sbindir/printerdrake", 1, "$_sbindir/printerdrake" ],
_("Scanner") => [ "scannerdrake", "$_sbindir/scannerdrake", 1 ],
+ _("Users") => [ "userdrake", "$_bindir/userdrake", 1 ],
_("Keyboard") => [ "keyboarddrake", "$_sbindir/keyboarddrake", 1 ],
_("Hard Drives") => [ "diskdrake", "$_sbindir/diskdrake --hd", 1 ],
_("NFS mount points") => [ "diskdrake", "$_sbindir/diskdrake --nfs", 1 ],
@@ -211,7 +212,6 @@ my @tree =
[_("Logs"), 'logdrake-mdk'],
[_("Console"), 'console-mdk'],
[_("Users"), 'user-mdk'],
-# [_("Users"), 'user-mdk'],
# [_("RFBDrake"), 'unknown-mdk'],
]
],
@@ -549,8 +549,7 @@ sub sig_usr2 {
}
sub compute_exec_string {
- my ($arg) = @_;
- my ($log_exp, $exec, $gtkplug, $alternate) = @$arg;
+ my ($log_exp, $exec, $gtkplug, $alternate) = @{$_[0]};
if ($embedded) {
if ($gtkplug != -1) {
$notebook_global->hide;