From 02beb8fcb4837242c193fafb91c408d963dee500 Mon Sep 17 00:00:00 2001
From: Sebastien Dupont <sdupont@mandriva.com>
Date: Thu, 29 Nov 2001 13:49:08 +0000
Subject: cleanning code.

---
 perl-install/standalone/drakfont | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index aba44b1ac..8b93d08b3 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -64,6 +64,7 @@
 # TODO:
 #     - abiword, Koffice, Gnumeric, ...  
 #     - Speedo  and Bitmap (PCF, BDF, and SNF)
+#     - option strong: strong verification with ttmkfdir -c ?
 #                
 # REQUIRE:
 #     - font-tools.*.mdk.i586.rpm
@@ -77,6 +78,7 @@
 # directory to install fonts /usr/X11R6/lib/X11/fonts/
 # -->> /usr/X11R6/lib/X11/fonts/drakfont
 
+
 use Gtk;
 use lib qw(..);
 use interactive;
@@ -154,8 +156,6 @@ foreach (@ARGV) {
     $mode == 2 and push @uninstall, $_;
 }
 
-
-
 foreach my $i (@application) {
     if ( $i =~ /so/i) {
 	if ( $gs != 2 ) { $gs = 0;}
@@ -192,7 +192,6 @@ my @fontsdir_to_install;
 my @fontsdir_to_uninstall;
 my @installed_fonts_full_path;
 
-
 sub list_fontpath {
     foreach (grep { /\d+:\s/ } `$chkfontpath -l`) {
 	chomp;
@@ -202,7 +201,6 @@ sub list_fontpath {
     }
 }
 
-
 sub chk_empty_xfs_path {
     my @temp3;
     foreach  my $tmp_path (@installed_fonts_path) {
@@ -219,10 +217,6 @@ sub chk_empty_xfs_path {
     }
 }
 
-
-
-
-
 sub search_installed_fonts {
     list_fontpath();
     $interactive and progress($pbar, 0.01, _("Search installed fonts"));
@@ -273,7 +267,6 @@ sub is_a_font {
 }
 
 # Optimisation de cette etape indispensable
-
 sub search_dir_font {
     foreach my $fn (@install) {
 	my @font_list_tmp = ();
@@ -327,7 +320,6 @@ sub search_dir_font_uninstall_gi {
     $interactive and progress($pbar, 1, _("Search fonts in installed list"));
 }
 
-
 sub print_list { print "Font(s) to Install :\n\n"; print "$_\n" foreach (@font_list) }
 
 sub dir_created {
@@ -433,6 +425,7 @@ sub remove_gs_fonts {
 	print $_ foreach @Fontmap_new;
 	output($FontmapGS, @Fontmap_new );
     }
+
 }
 
 sub remove_fonts {
@@ -510,8 +503,6 @@ sub backend_mod {
     }
 }
 
-
-
 sub create_fontsel {
     my $font_sel;
     gtkpack($font_box,
@@ -590,7 +581,6 @@ sub interactive_mode {
     Gtk->exit(0);
 }
 
-
 sub license {
     my ($function) = @_,
     my $text = new Gtk::Text(undef, undef);
@@ -613,7 +603,6 @@ sub license {
     $font_box->show_all();
 }
 
-
 sub about {
     my $text = new Gtk::Text(undef, undef);
     my $about_box;
@@ -663,8 +652,6 @@ sub about {
     $font_box->show_all();
 }
 
-
-
 sub help {
     my $text = new Gtk::Text(undef, undef);
     my $help_box;
@@ -729,7 +716,6 @@ Visual Interface:
     $font_box->show_all();
 }
 
-
 sub appli_choice {
     my $choice_box;
     gtkpack($font_box,
@@ -804,7 +790,6 @@ sub advanced_install {
 					  gtksignal_connect(new Gtk::Button(_("Remove Selected")), clicked => \&list_remove, $list),
 					  gtksignal_connect(new Gtk::Button(_("Install List")), clicked => sub { 
 					      ${$central_widget}->destroy(); appli_choice()  }),
-#import_status() }),$
 					  ),
 				)
 	    );
@@ -936,9 +921,3 @@ sub progress {
 }
 
 
-# option strong: verifier strong  ttmkfdir -c ???
-# gestion abiword, netscape, gimp....
-# remove this directory of the de fontpath if there is only 2 files in directory (fonts.dir & fonts.scale)
-# do type1inst in this path
-# peu etre un petit pb avec "/etc/rc.d/init.d/xfs restart"
-#  ?? :$check11->signal_connect( 'toggled',  sub { $gs == 0 and $gs = 1 or $gs = 0; print "gs =  $gs\n" });
-- 
cgit v1.2.1