From e49e0b0369cec11d4d85111d3a134d9d8b94d25e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 8 Sep 2008 10:08:24 +0000
Subject: (new) make draksplash working again

regression introcued on 2008-08-18: "really fix another focus bug (#42750)"
---
 perl-install/NEWS                  | 2 ++
 perl-install/standalone/draksplash | 4 ++--
 perl-install/ugtk2.pm              | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index cc7f98e86..b9b8edebf 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,6 +6,8 @@
 - drakboot:
   o update /etc/sysconfig/desktop since we read it in order to display
     previous setting
+- draksplash:
+  o make it working again
 
 Version 11.36 - 5 September 2008
 
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 72c9fcaf4..a14b7ecda 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -15,14 +15,14 @@ $in->do_pkgs->ensure_is_installed('ImageMagick', '/usr/bin/convert') or close_al
 $in->do_pkgs->ensure_is_installed('netpbm', '/usr/bin/jpegtopnm') or close_all();
 
 $ugtk2::wm_icon = 'draksplash-16';
-my $window = ugtk2->new('DrakSplash');
+my $window = ugtk2->new('DrakSplash', do_not_track_main_window => 1);
 $window->{rwindow}->signal_connect(delete_event => \&close_all);
 
 my @image_pixbuf;
 my $current_rect = [];
 my $current_point;
 
-my $preview_window = ugtk2->new(N("Create new theme"));
+my $preview_window = ugtk2->new(N("Create new theme"), do_not_track_main_window => 1);
 my $image_area = create_image_area();
 my $scroll = gtknew('ScrolledWindow', child => $image_area);
 
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 0dd0e0fa8..f32ca85dd 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -738,7 +738,7 @@ sub new {
     my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon};
     my $banner_title = $opts{banner_title};
     $title = uc($title) if $::isInstall;
-    $o->{transient} ||= $::main_window if $::main_window;
+    $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window};
     my $window = gtknew(
 	'MagicWindow',
 	title => $title || '',
@@ -751,7 +751,7 @@ sub new {
 	if_(!$::isInstall, icon_no_error => wm_icon()),
 	if_($o->{transient}, transient_for => $o->{transient}), 
     );
-    push @::main_windows, $::main_window = $window->{real_window};
+    push @::main_windows, $::main_window = $window->{real_window} if !$opts{do_not_track_main_window};
     $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded;
 
     $o->{rwindow} = $o->{window} = $window;
-- 
cgit v1.2.1