[gnome-shell/gnome-3-2] workspaceThumbnail: disconnect handlers when workspace is removed
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-2] workspaceThumbnail: disconnect handlers when workspace is removed
- Date: Wed, 18 Jan 2012 15:31:32 +0000 (UTC)
commit d9ab2320d5ee77b1ddeab58fbd6349137199e4bc
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Wed Jan 11 17:24:42 2012 -0500
workspaceThumbnail: disconnect handlers when workspace is removed
We need to remove the handlers when the workspace is removed, not
when the animation of it being removed finishes, or we can access
a destroyed workspace and triggger an assertion failure in Mutter.
https://bugzilla.redhat.com/show_bug.cgi?id=705664
https://bugzilla.gnome.org/show_bug.cgi?id=667652
js/ui/workspaceThumbnail.js | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 0369c38..97464e7 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -148,6 +148,8 @@ WorkspaceThumbnail.prototype = {
this.metaWorkspace = metaWorkspace;
this.monitorIndex = Main.layoutManager.primaryIndex;
+ this._removed = false;
+
this.actor = new St.Group({ reactive: true,
clip_to_allocation: true,
style_class: 'workspace-thumbnail' });
@@ -278,7 +280,7 @@ WorkspaceThumbnail.prototype = {
},
_doAddWindow : function(metaWin) {
- if (this.leavingOverview)
+ if (this._removed)
return;
let win = metaWin.get_compositor_private();
@@ -288,7 +290,7 @@ WorkspaceThumbnail.prototype = {
// the compositor finds out about them...
Mainloop.idle_add(Lang.bind(this,
function () {
- if (this.actor &&
+ if (!this._removed &&
metaWin.get_compositor_private() &&
metaWin.get_workspace() == this.metaWorkspace)
this._doAddWindow(metaWin);
@@ -344,7 +346,12 @@ WorkspaceThumbnail.prototype = {
this.actor.destroy();
},
- _onDestroy: function(actor) {
+ workspaceRemoved : function() {
+ if (this._removed)
+ return;
+
+ this._removed = true;
+
this.metaWorkspace.disconnect(this._windowAddedId);
this.metaWorkspace.disconnect(this._windowRemovedId);
global.screen.disconnect(this._windowEnteredMonitorId);
@@ -357,6 +364,10 @@ WorkspaceThumbnail.prototype = {
delete metaWin._minimizedChangedId;
}
}
+ },
+
+ _onDestroy: function(actor) {
+ this.workspaceRemoved();
this._windows = [];
this.actor = null;
@@ -584,6 +595,8 @@ ThumbnailsBox.prototype = {
if (thumbnail.state > ThumbnailState.NORMAL)
continue;
+ thumbnail.workspaceRemoved();
+
if (currentPos >= start && currentPos < start + count)
this._setThumbnailState(thumbnail, ThumbnailState.REMOVING);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]