From e4371f18753c98687f71de82810acc79428c51f9 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Fri, 5 Sep 2003 11:42:20 +0000
Subject: *** empty log message ***

---
 postfix_wizard/Postfix.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'postfix_wizard')

diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 7a78fb83..20fd9af7 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -35,7 +35,9 @@ my $o = {
 	var => { 
 	    wiz_mail_masquerade => '',
 	    wiz_ext_mail_relay => ''
-	}
+	},
+	needed_rpm => [ 'postfix' ],
+	defaultimage => "$ENV{__WIZARD_HOME__}postfix_wizard/images/courrier.png"
     };
 
 $o->{pages} = { 
@@ -51,7 +53,6 @@ $o->{pages} = {
 		  },
 		  post => \&check_masquerade,
                   data => [
-		      { label => '' },
 		      { label => N("Mail Address:"),  val => \$o->{var}{wiz_mail_masquerade} },
 		      ],
 	          next => 'isp'
@@ -60,7 +61,6 @@ $o->{pages} = {
 		name => N("Warning:"),
 		data => [ 
 		    { label => N("You entered an empty address for the mail gateway.") },
-		    { label => "" },
 		    { label => N("Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value.") } 
 		],
 	        next => 'summary'
@@ -77,7 +77,6 @@ $o->{pages} = {
 		  },
 		  post => \&check_relay,
                   data => [
-		      { label => '' },
 		      { label => N("Mail Server Name:"),  val => \$o->{var}{wiz_ext_mail_relay} },
 		      ],
 	          next => 'summary'
@@ -86,7 +85,6 @@ $o->{pages} = {
 	        name =>  N("Configuring the Internet Mail") . "\n\n" . N("The wizard collected the following parameters needed to configure your Internet Mail Service:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
 		      { label => N("Internet Mail Gateway"), fixed_val => \$o->{var}{wiz_ext_mail_relay} },
-		      { label => '' },
 		      { label => N("Form of the Address"), fixed_val => \$o->{var}{wiz_mail_masquerade} },
 		  ],
 		post => \&do_it,
@@ -135,7 +133,7 @@ sub get_mail_relay {
 }
 
 sub do_it {
-    $::DEBUG and return
+    $::testing and return
     my @conf = qw(/etc/postfix/aliases
 		  /etc/postfix/canonical
 		  /etc/postfix/main.cf
-- 
cgit v1.2.1