main: correct pushModal/popModal mechanism

1. disconnect destroy signals in popModal (actors can have great lifetime and then pushed again)
2. incorrect pushModal/popModal pair in overview
https://bugzilla.gnome.org/show_bug.cgi?id=64078
This commit is contained in:
Maxim Ermilov
2011-02-25 01:29:20 +03:00
parent 84889d6dea
commit 3a6b4f3eb5
2 changed files with 40 additions and 25 deletions

View File

@ -655,20 +655,20 @@ Overview.prototype = {
if (this._shown) {
if (!this._modal) {
if (Main.pushModal(this.dash.actor))
if (Main.pushModal(this._group))
this._modal = true;
else
this.hide();
}
} else if (this._shownTemporarily) {
if (this._modal) {
Main.popModal(this.dash.actor);
Main.popModal(this._group);
this._modal = false;
}
global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
} else {
if (this._modal) {
Main.popModal(this.dash.actor);
Main.popModal(this._group);
this._modal = false;
}
else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)