diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-15 21:55:35 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-15 21:55:35 +0000 |
| commit | 34896ed28004de6f52fa464acc6a2e0a0bab6a44 (patch) | |
| tree | 32bc2dd0b2ecfba05fe1a9e0ae542f4173ffcd38 | |
| parent | de7b0588f6f6a67bfabaa451fad9c85fdc4561d0 (diff) | |
| download | drakx-34896ed28004de6f52fa464acc6a2e0a0bab6a44.tar drakx-34896ed28004de6f52fa464acc6a2e0a0bab6a44.tar.gz drakx-34896ed28004de6f52fa464acc6a2e0a0bab6a44.tar.bz2 drakx-34896ed28004de6f52fa464acc6a2e0a0bab6a44.tar.xz drakx-34896ed28004de6f52fa464acc6a2e0a0bab6a44.zip | |
do not create spurious top window when embedded (why does this fsck us
only now?)
| -rw-r--r-- | perl-install/ugtk2.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 7c1ec65b7..9a790a643 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -842,7 +842,7 @@ sub new { my $o = bless { %opts }, $type; - $o->_create_window($title); + $o->_create_window($title) if !$::isEmbedded; while (my $e = shift @tempory::objects) { $e->destroy } $o->{pop_it} ||= $pop_it || !$::isWizard && !$::isEmbedded || $::WizardTable && do { @@ -865,7 +865,7 @@ sub new { $o->{window} = Gtk2::VBox->new(0,0); $o->{window}->set_border_width($::Wizard_splash ? 0 : 10); $o->{rwindow} = $o->{window}; - if (!defined($::WizardWindow)) { + if (!defined($::WizardWindow) && !$::isEmbedded) { $::WizardWindow = Gtk2::Window->new('toplevel'); $::WizardWindow->signal_connect(delete_event => sub { die 'wizcancel' }); $::WizardWindow->signal_connect(expose_event => \&_XSetInputFocus) if $force_focus || $o->{force_focus}; @@ -921,7 +921,7 @@ sub new { $::WizardWindow->show_all; flush(); } - $::WizardTable->attach($o->{window}, 0, 2, 1, 2, ['fill', 'expand'], ['fill', 'expand'], 0, 0); + $::WizardTable->attach($o->{window}, 0, 2, 1, 2, ['fill', 'expand'], ['fill', 'expand'], 0, 0) if !$::isEmbedded; } if ($::isEmbedded && !$o->{pop_it}) { |