clen up

1 files changed, 20 insertions, 22 deletions

diff --git a/control-center b/control-center
index 3dae0126..430840bb 100755
--- a/control-center
+++ b/control-center
@@ -209,11 +209,11 @@ sub draw_exposed {
     $pix->draw_string($style->font, $darea1->style->black_gc, 73, 170, _("The place where you can configure your Mandrake Box") );
 
     my @revtree;
-    open VERS,  "/etc/redhat-release" or die( sprintf _("cannot open this file for read: $!"));
+    open VERS,  "/etc/mandrake-release" or die(sprintf _("cannot open this file for read: $!"));
     while (<VERS>) { push (@revtree,$_) }
     my @info_tree = split / /, $revtree[0];
 
-    my ($sysname, $nodename, $release, $version, $machine ) = POSIX::uname();
+    my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname();
 
     my $style1 = new Gtk::Style;
     $style1->font(Gtk::Gdk::Font->fontset_load("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"));
@@ -238,9 +238,8 @@ sub gtkcreate_png {
 }
 
 sub quit_global {
-    foreach(@pid_launched)
-    {
-    kill TERM, $_;
+    foreach(@pid_launched) {
+	kill TERM, $_;
     }
     Gtk->exit(0);
 }
@@ -308,11 +307,12 @@ sub connect_to_site {
 }
 
 my $treeitem_old;
+
 sub create_tree_item {
     my ($parent_tree, $label, $pixmap, $tree_depth_max) =@_;
     
     my $expanded=0;
-    my ($treeitem, $treebox, $new_subtree);
+    my $treeitem, $treebox, $new_subtree;
     $treeitem = new Gtk::TreeItem();
     $treebox = xpm_label_box($window_global,$pixmap,$label, !$tree_depth_max);
     $treeitem->add($treebox);
@@ -328,13 +328,12 @@ sub create_tree_item {
     $treeitem->show_all();
 
     if ($tree_depth_max) {
-	$tree_depth_max-- ;
+	$tree_depth_max--;
 	$new_subtree= new Gtk::Tree();
 	$treeitem->set_subtree($new_subtree);
 	$new_subtree->ref();
 	unshift(@treeitem_sub, $new_subtree);
     }
-
 }
 
 sub xpm_label_box {
@@ -348,17 +347,17 @@ sub xpm_label_box {
 	$box->pack_start($box2, 0, 0, 0);
     }
     # Get the style of the button to get the background color.
-    my $style = $parent->get_style()->bg( 'normal' );
+    my $style = $parent->get_style()->bg('normal');
     # Now on to the xpm stuff
-    my ($pixmap, $mask) = gtkcreate_png($xpm_filename );
-    my $pixmapwid = new Gtk::Pixmap( $pixmap, $mask );
+    my ($pixmap, $mask) = gtkcreate_png($xpm_filename);
+    my $pixmapwid = new Gtk::Pixmap($pixmap, $mask);
     # Create a label for the button
-    my $label = new Gtk::Label( $label_text );
+    my $label = new Gtk::Label($label_text);
     # Pack the pixmap and label into the box
-    $box->pack_start( $pixmapwid, 0, 0, 3 );
-    $box->pack_start( $label, 0, 0, 3 );
-    $box->border_width( 2 );
-    return ( $box );
+    $box->pack_start($pixmapwid, 0, 0, 3);
+    $box->pack_start($label, 0, 0, 3);
+    $box->border_width(2);
+    return ($box);
 }
 
 sub exec_treeitem {
@@ -383,7 +382,7 @@ sub exec_treeitem {
 	    $tree_launched{$label}->[0]=$nb_pages;
 	    $notebook_global->set_page($nb_pages);
 	    $socket->realize;
-	    $socket->steal(launch_wait("kups", "kups",3));
+	    $socket->steal(launch_wait("konqueror", "konqueror",3));
 	    $notebook_global->show_all();
 	    $notebook_global->set_page($nb_pages);
 	    return;
@@ -438,7 +437,7 @@ sub exec_treeitem {
 					  });
 
 	$socket->realize;
-	#	    $label->destroy;
+#	$label->destroy;
 	my $a = $exec_string . " --embedded " . $socket->window->XWINDOW . " " . $$;
 	my $pid;
 	unless ($pid = fork) {
@@ -456,13 +455,13 @@ sub exec_treeitem {
 }
 
 sub launch_wait {
-    my $exec, $grep, $num = @_;
+    my ($exec, $grep, $num) = @_;
     print "{{ $exec }}\n";
     my $b = "xwininfo -root -tree -int | grep '" . $grep . "'";
     my @before = split ('\n', `$b`);
     unless ($pid = fork) {
 	die(_("cannot fork: $~")) unless defined $pid;
-	exec($_[0]);
+	exec($exec);
     }
     $pid_launched[$nb_pages] = $pid;
     $nb_pages++;
@@ -472,7 +471,6 @@ sub launch_wait {
 	while (@after ne ($num+@before)) {
 	    @after = split ('\n', `$b`);
 	}
-	
 	my $i = 0;
 	my $c;
 	foreach (@after) {
@@ -536,7 +534,7 @@ sub create_item_factory {
 	$box1->pack_start($box2, 0, 1, 0);
 	
 	$button = new Gtk::Button(_("Close"));
-	$button->signal_connect('clicked', sub {$item_factory_window->destroy;});
+	$button->signal_connect(clicked => sub {$item_factory_window->destroy;});
 	$box2->pack_start($button, 1, 1, 0);
 	$button->can_default(1);
 	$button->grab_default;