From 13960f2b7428d0098b9798cbf4f0684d481c2409 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 27 Jan 2002 19:25:55 +0000
Subject: - move the require on my_gtk to ask_standalone_gtk - cleanup

---
 perl-install/services.pm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'perl-install/services.pm')

diff --git a/perl-install/services.pm b/perl-install/services.pm
index 818397f18..b8a71b735 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -8,7 +8,6 @@ use strict;
 #-######################################################################################
 use common;
 use run_program;
-use my_gtk qw(:helpers :wrappers);
 
 sub description {
     my %services = (
@@ -183,6 +182,10 @@ sub ask_install {
 sub ask_standalone_gtk {
     my ($in, $prefix) = @_;
     my ($l, $on_services) = services($prefix);
+
+    require my_gtk;
+    my_gtk->import(qw(:helpers :wrappers));
+
     my $W = my_gtk->new(_("Services"));
     my ($x, $y, $w_popup);
     my $nopop = sub { $w_popup and $w_popup->destroy };
@@ -285,14 +288,4 @@ sub services {
     [ map { $_->[0] } @l ], [ map { $_->[0] } grep { $_->[1] } @l ];
 }
 
-sub mapgrep(&@) {
-    my $f = shift;
-    my @l;
-    foreach (@_) {
-	my ($b, $v) = $f->($_);
-	push @l, $v if $b;
-    }
-    @l;
-}
-
 1;
-- 
cgit v1.2.1