isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdndHandler: Correctly disconnect the window group visibility handler

Browse Source
This commit is contained in:
Adel Gadllah 2011-03-04 08:57:46 +01:00
parent 2ee4f57395
commit 0065e2cfac
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/xdndHandler.js
View File

@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
const Lang = imports.lang; const Lang = imports.lang;
const Shell = imports.gi.Shell; const Shell = imports.gi.Shell;
const Signals = imports.signals; const Signals = imports.signals;
const Mainloop = imports.mainloop;
const DND = imports.ui.dnd; const DND = imports.ui.dnd;
function XdndHandler() { function XdndHandler() {
@ -41,9 +40,14 @@ XdndHandler.prototype = {
// Called when the user cancels the drag (i.e release the button) // Called when the user cancels the drag (i.e release the button)
_onLeave: function() { _onLeave: function() {
if (this._windowGroupVisibilityHandlerId != 0) { if (this._windowGroupVisibilityHandlerId != 0) {
Mainloop.source_remove(this._windowGroupVisibilityHandlerId); global.window_group.disconnect(this._windowGroupVisibilityHandlerId);
this._windowGroupVisibilityHandlerId = 0; this._windowGroupVisibilityHandlerId = 0;
} }
if (this._cursorWindowClone) {
this._cursorWindowClone.destroy();
this._cursorWindowClone = null;
}
this.emit('drag-end'); this.emit('drag-end');
}, },
@ -77,8 +81,7 @@ XdndHandler.prototype = {
// Make sure that the clone has the same position as the source // Make sure that the clone has the same position as the source
this._cursorWindowClone.add_constraint(constraint_position); this._cursorWindowClone.add_constraint(constraint_position);
} else { } else {
if (this._cursorWindowClone) if (this._cursorWindowClone) {
{
this._cursorWindowClone.destroy(); this._cursorWindowClone.destroy();
this._cursorWindowClone = null; this._cursorWindowClone = null;
} }