aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-30 00:58:03 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-30 00:58:03 +0000
commit3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4 (patch)
treeae26d86bbfeb7da0db188f67456449203c0dd221
parentff6d080470a93edc5f980ff74f14cd4bd040c345 (diff)
downloadrpmdrake-3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4.tar
rpmdrake-3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4.tar.gz
rpmdrake-3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4.tar.bz2
rpmdrake-3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4.tar.xz
rpmdrake-3fd7a0075a2f5a3edb215bfb740d6f13933fc5c4.zip
(new,DESTROY) stop accounting main windows which collides with
mygtk2's accounting resulting in broken transient_for hints (regression introduced in drakxtools-11.10.2 on 18 August 2008 while fixing focus issues (#42750))
-rw-r--r--NEWS3
-rw-r--r--Rpmdrake/gurpm.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 7eb4bead..576a73ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- fix modality/transient hints
+ (regression introduced in drakxtools-11.10.2 on 18 August 2008 while
+ fixing focus issues)
- rpmdrake:
o workaround crashing when tree selection wasn't realized yet
(#41010)
diff --git a/Rpmdrake/gurpm.pm b/Rpmdrake/gurpm.pm
index 2879e77b..a148d7c1 100644
--- a/Rpmdrake/gurpm.pm
+++ b/Rpmdrake/gurpm.pm
@@ -33,7 +33,6 @@ use base qw(ugtk2);
sub new {
my ($self, $title, $initializing, %options) = @_;
my $mainw = bless(ugtk2->new($title, %options, default_width => 600, width => 600), $self);
- $mainw->{previous_main_window} = $::main_window;
$::main_window = $mainw->{real_window};
$mainw->{label} = gtknew('Label', text => $initializing, alignment => [ 0.5, 0 ]);
# size label's heigh to 2 lines in order to prevent dummy vertical resizing:
@@ -70,7 +69,7 @@ sub progress {
sub DESTROY {
my ($self) = @_;
- $::main_window = $self->{previous_main_window};
+ mygtk2::may_destroy($self);
$self and $self->destroy;
$self = undef;
$self->{cancel} = undef; #- in case we'll do another one later