inline seclevel_explain (why using functions to return a text label ?)

2 files changed, 16 insertions, 24 deletions

diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm
index 3e23a8ce9..4fed477a5 100644
--- a/perl-install/security/main.pm
+++ b/perl-install/security/main.pm
@@ -29,12 +29,24 @@ sub show_msec_help {
 }
 
 sub basic_seclevel_explanations {
-	my $msec = $_[0];
-	my $seclevel_explain = $msec->seclevel_explain();
-
 	my $text = new Gtk::Text(undef, undef);
 	$text->set_editable(0);
-	$text->insert(undef, $text->style->black, undef, $seclevel_explain);
+	$text->insert(undef, $text->style->black, undef,
+			    "Standard: This is the standard security recommended for a computer that will be used to connect
+               to the Internet as a client.
+
+High:       There are already some restrictions, and more automatic checks are run every night.
+
+Higher:    The security is now high enough to use the system as a server which can accept
+              connections from many clients. If your machine is only a client on the Internet, you
+	      should choose a lower level.
+
+Paranoid:  This is similar to the previous level, but the system is entirely closed and security
+                features are at their maximum
+
+Security Administrator:
+               If the 'Security Alerts' option is set, security alerts will be sent to this user (username or
+	       email)");
 
 	gtkpack_(gtkshow(new Gtk::HBox(0, 0)), 1, $text);
 }
diff --git a/perl-install/security/msec.pm b/perl-install/security/msec.pm
index 4e105f264..4bf604338 100644
--- a/perl-install/security/msec.pm
+++ b/perl-install/security/msec.pm
@@ -131,26 +131,6 @@ sub get_default {
     $default_value;
 }
 
-# ***********************************************
-#                 EXPLANATIONS
-# ***********************************************
-sub seclevel_explain {
-"Standard: This is the standard security recommended for a computer that will be used to connect
-               to the Internet as a client.
-
-High:       There are already some restrictions, and more automatic checks are run every night.
-
-Higher:    The security is now high enough to use the system as a server which can accept
-              connections from many clients. If your machine is only a client on the Internet, you
-	      should choose a lower level.
-
-Paranoid:  This is similar to the previous level, but the system is entirely closed and security
-                features are at their maximum
-
-Security Administrator:
-               If the 'Security Alerts' option is set, security alerts will be sent to this user (username or
-	       email)";
-}
 
 # ***********************************************
 #               SPECIFIC OPTIONS