summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-07 15:16:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-07 15:16:28 +0000
commit644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb (patch)
treec2ec399348b12cb1a8c5e101ccb79c013dc8a545
parent1c2faefdc0d57d1f4423bec36aaad88c242392a3 (diff)
downloaddrakx-644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb.tar
drakx-644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb.tar.gz
drakx-644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb.tar.bz2
drakx-644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb.tar.xz
drakx-644ae805dfdd9ea7cca5c50521e9ed3a6c0801eb.zip
$w->{isEmbedded} is unused
-rw-r--r--perl-install/interactive/gtk.pm2
-rw-r--r--perl-install/ugtk2.pm8
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index d234a3ad2..b40f70a47 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -732,7 +732,7 @@ sub wait_messageW($$$) {
$box->pack_start($_, 1, 1, 4) foreach @l;
($w->{wait_messageW} = $l[-1])->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 });
- $w->{rwindow}->set_position('center') if $::isStandalone && !$w->{isEmbedded} && !$::isWizard;
+ $w->{rwindow}->set_position('center') if $::isStandalone && !$::isEmbedded && !$::isWizard;
$w->{window}->show_all;
$w->sync until $w->{displayed};
$w;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 5714856d5..83f076a19 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -831,9 +831,7 @@ sub new {
my $o = bless { %opts }, $type;
while (my $e = shift @tempory::objects) { $e->destroy }
- $o->{isEmbedded} ||= $::isEmbedded;
-
- $o->{pop_it} ||= $pop_it || !$::isWizard && !$o->{isEmbedded} || $::WizardTable && do {
+ $o->{pop_it} ||= $pop_it || !$::isWizard && !$::isEmbedded || $::WizardTable && do {
#- do not take into account the DrawingArea
any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children;
};
@@ -861,7 +859,7 @@ sub new {
$::WizardTable ||= gtknew('VBox');
- if (!$::Plug && $o->{isEmbedded}) {
+ if (!$::Plug && $::isEmbedded) {
$::Plug = $::WizardWindow = gtknew('Plug',
socket_id => $::XID,
icon => wm_icon(),
@@ -877,7 +875,7 @@ sub new {
if ($::isInstall) {
require install_gtk; #- for perl_checker
$::WizardWindow->signal_connect(key_press_event => \&install_gtk::special_shortcuts);
- } elsif (!$o->{isEmbedded}) {
+ } elsif (!$::isEmbedded) {
$::WizardWindow->set_position('center_always') if !$::isStandalone;
eval { gtkpack__($::WizardTable, Gtk2::Banner->new(wm_icon(), $::Wizard_title)) };
$@ and log::l("ERROR: missing wizard banner");