diskdrake: when non embedded, ensure sub window are modal

all other drakx tool can be fixed the same way

2 files changed, 3 insertions, 2 deletions

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index e6e0b6676..459468e30 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -55,6 +55,7 @@ sub main {
     local $in->{grab} = 1;
 
     $w = ugtk2->new('DiskDrake');
+    $::main_window = $w->{rwindow} unless $::isEmbedded;
     my $rc = "/usr/share/libDrakX/diskdrake.rc";
     -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
     -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc";
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index ce2cd0974..f411517a6 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -336,7 +336,7 @@ sub ask_fromW {
     my ($o, $common, $l, $l2) = @_;
     my $ignore = 0; #-to handle recursivity
 
-    my $mainw = ugtk2->new($common->{title}, %$o);
+    my $mainw = ugtk2->new($common->{title}, %$o, if__($::main_window, transient => $::main_window));
  
     #-the widgets
     my (@widgets, @widgets_always, @widgets_advanced, $advanced, $advanced_pack, $has_horiz_scroll, $has_scroll, $max_width);
@@ -672,7 +672,7 @@ sub wait_messageW($$$) {
     my ($o, $title, $messages) = @_;
 
     local $ugtk2::pop_it = 1;
-    my $w = ugtk2->new($title, %$o, grab => 1);
+    my $w = ugtk2->new($title, %$o, grab => 1, if__($::main_window, transient => $::main_window));
     gtkadd($w->{window}, my $hbox = Gtk2::HBox->new(0,0));
     $hbox->pack_start(my $box = Gtk2::VBox->new(0,0), 1, 1, 10);  
     $box->pack_start($_, 1, 1, 4) foreach my @l = map { Gtk2::Label->new(scalar warp_text($_)) } @$messages;