From 30c91ad54bfca1530c542e1b78f531087b47f71a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 12 Jan 2004 11:35:34 +0000
Subject: fix embedding: - prevent subwindows being too small - prevent
 subwindows breaking when canceled

---
 perl-install/interactive/gtk.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/interactive')

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 39463e47e..d4b841c78 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -660,7 +660,7 @@ sub ask_fromW {
     my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @help, if_(@$l2, $advanced_button));
 
     $pack->pack_start(gtkshow($always_pack), 1, 1, 0);
-    $advanced_pack = create_scrolled_window($advanced_pack, [ 'never', 'automatic' ], 'none') if !$::isEmbedded;
+    $advanced_pack = create_scrolled_window($advanced_pack, [ 'never', 'automatic' ], 'none') if !$mainw->{isEmbedded};
     $pack->pack_start($advanced_pack, 1, 1, 0) if @widgets_advanced;
     if ($buttons_pack) {
 	if ($::isWizard && !$mainw->{pop_it} && $::isInstall) {
@@ -669,7 +669,7 @@ sub ask_fromW {
 	}
 	$pack->pack_start(gtkshow($buttons_pack), 0, 0, 0);
     }
-    gtkadd($mainw->{window}, $::isEmbedded ? create_scrolled_window($pack, [ 'automatic', 'automatic' ], 'none') : $pack);
+    gtkadd($mainw->{window}, $mainw->{isEmbedded} ? create_scrolled_window($pack, [ 'automatic', 'automatic' ], 'none') : $pack);
     $set_default_size->() if $has_scroll_always;
     $set_advanced->($common->{advanced_state});
     
-- 
cgit v1.2.1