From 570abb94b78febc2cb55452dbcb14b69680f1114 Mon Sep 17 00:00:00 2001 From: Yves Duret Date: Wed, 20 Jun 2001 11:55:19 +0000 Subject: yvounetification --- control-center | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/control-center b/control-center index 59b0a271..19b4a2d4 100755 --- a/control-center +++ b/control-center @@ -269,7 +269,7 @@ sub about_mdk_cc { } sub splash_warning { - my ($label) = @_; + my $label = @_; my $win_about = new Gtk::Dialog(); $win_about->set_position(1); @@ -293,32 +293,15 @@ sub connect_to_site { my $browser=$ENV{'BROWSER'}; my $initial_user=$ENV{'INITIAL_USER'}; my $user_current=$ENV{'USER'}; - if ($help) - { - if ($browser) - { - print ("»$browser«\n»$link«\n"); - system("$browser $link &"); - } - else - { - splash_warning(" "._("Warning: No browser specified")." "); - } - } - else - { - if($initial_user ne "root" && $initial_user ne undef) - { - if ($browser) - { - system("su -m -l $initial_user -c \"$browser $link &\""); - } - else - { - splash_warning(" "._("Warning: No browser specified")." "); - } - } - else { + + if (!$browser) {splash_warning(" "._("Warning: No browser specified")." "); return;} + + if ($help) { + system("$browser $link &"); + } else { + if ($initial_user ne "root" && $initial_user ne undef) { + system("su -m -l $initial_user -c \"$browser $link &\""); + } else { splash_warning(" "._("Security Warning: I'm not allowed to connect to the internet as root user")." "); } } @@ -335,10 +318,10 @@ sub create_tree_item { $treeitem->add($treebox); if ($tree_depth_max == 0) { $tree_launched{$label}->[1]=\$treeitem; - $treeitem->signal_connect('select', sub { exec_treeitem($label, $tree_exec{$label}, -e $tree_exec{$label} ) }); + $treeitem->signal_connect(select => sub { exec_treeitem($label, $tree_exec{$label}, -e $tree_exec{$label} ) }); } else { - $treeitem->signal_connect('button_press_event', sub { $expanded ? $treeitem->collapse : $treeitem->expand; $expanded = !$expanded }); - $treeitem->signal_connect('select', sub { $treeitem_old and $$treeitem_old->collapse(); $treeitem->expand(); $treeitem_old=\$treeitem; + $treeitem->signal_connect(button_press_event => sub { $expanded ? $treeitem->collapse : $treeitem->expand; $expanded = !$expanded }); + $treeitem->signal_connect(select => sub { $treeitem_old and $$treeitem_old->collapse(); $treeitem->expand(); $treeitem_old=\$treeitem; $expanded=1; }); } -- cgit v1.2.1