summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-07 13:28:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-07 13:28:50 +0000
commit06d300a1e541a75434ceb15d19c6e254aedf6dad (patch)
treeb93019fc0aa5c183ba938a94854a38c86136c422
parent3bd2c32983f5d5352d5a1ba6362704fa1ac274bc (diff)
downloaddrakx-06d300a1e541a75434ceb15d19c6e254aedf6dad.tar
drakx-06d300a1e541a75434ceb15d19c6e254aedf6dad.tar.gz
drakx-06d300a1e541a75434ceb15d19c6e254aedf6dad.tar.bz2
drakx-06d300a1e541a75434ceb15d19c6e254aedf6dad.tar.xz
drakx-06d300a1e541a75434ceb15d19c6e254aedf6dad.zip
- don't pop the "do you want to install samba?"
- rwindow is not a window when embedded, so set_default_size only if possible
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index f9fed7f78..3d46ad209 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -17,11 +17,14 @@ my ($all_hds, $in, $current_entry);
sub main {
($in, $all_hds, my $type) = @_;
my ($check, $create) = $type eq 'smb' ? (\&network::smb::check, \&smb_create) : (\&network::nfs::check, \&nfs_create);
- $check->($in) or return;
+ {
+ local $my_gtk::pop_it = 1;
+ $check->($in) or return;
+ }
my $w = my_gtk->new('DiskDrake');
$create->($w->{window});
- $w->{rwindow}->set_default_size(400, 300);
+ $w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size');
$w->{window}->show_all;
$w->main;
}