From 8631c51b00feadc9be8ebac138e5306557aaf1ba Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 24 Jul 2008 17:32:54 +0000
Subject: 
 (enteringStep,get_default_step_items,set_default_step_items,summary_prompt)
 no more need to define a default banner icon now we do not display them
 anymore

---
 perl-install/install/steps_gtk.pm | 8 ++++----
 perl-install/ugtk2.pm             | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 34f9dd625..a7807e036 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -149,8 +149,8 @@ sub enteringStep {
     my ($o, $step) = @_;
 
     printf "Entering step `%s'\n", common::remove_translate_context($o->{steps}{$step}{text});
-    if (my @banner_elts = ($o->{steps}{$step}{banner_icon}, translate($o->{steps}{$step}{banner_title}))) {
-        set_default_step_items(@banner_elts);
+    if (my $banner_title = $o->{steps}{$step}{banner_title}) {
+        set_default_step_items($banner_title);
     }
     $o->SUPER::enteringStep($step);
     install::gtk::update_steps_position($o);
@@ -609,9 +609,9 @@ sub summary_prompt {
 			   gtknew('Button', text => N("Configure"), clicked => sub { 
 						 $w->{rwindow}->hide;
 						 my ($old_icon, $old_title) = get_default_step_items();
-						 set_default_step_items($e->{banner_icon} || $old_icon, $e->{banner_title} || $old_title);
+						 set_default_step_items($e->{banner_title} || $old_title);
 						 $e->{clicked}(); 
-						 set_default_step_items($old_icon, $old_title);
+						 set_default_step_items($old_title);
 						 $w->{rwindow}->show;
 						 $set_entry_labels->();
 					     }) ];
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index b534be1c7..cc2b57b83 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -702,12 +702,12 @@ sub string_width {
 }
 
 
-my ($def_step_icon, $def_step_title);
+my ($def_step_title);
 sub set_default_step_items {
-    ($def_step_icon, $def_step_title) = @_;
+    ($def_step_title) = @_;
 }
 
-sub get_default_step_items { ($def_step_icon, $def_step_title) }
+sub get_default_step_items { ($def_step_title) }
 
 # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
 #                 toplevel window creation helper
@@ -730,7 +730,7 @@ sub new {
 	'MagicWindow',
 	title => $title || '',
 	pop_it => $o->{pop_it},
-	$::isInstall ? (banner => Gtk2::Banner->new($icon, $title || (get_default_step_items())[1])) : (),
+	$::isInstall ? (banner => Gtk2::Banner->new($icon, $title || (get_default_step_items()))) : (),
 	$::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (),
 	width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, 
 	modal => $opts{modal} || $grab || $o->{grab} || $o->{modal} || $o->{transient},
-- 
cgit v1.2.1