From 4beba796d741854f2f4069c6a0afc5eee22a5eda Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Mon, 17 Sep 2012 16:20:58 +0200 Subject: [PATCH] Wanda: remove unnecessary destroy signal connection 'destroy' is emitted before the actor is unmapped during destruction, so notify::mapped would emit an exception. Since unmapping is guaranteed, the 'destroy' signal is unnecessary. https://bugzilla.gnome.org/show_bug.cgi?id=684154 --- js/ui/wanda.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/js/ui/wanda.js b/js/ui/wanda.js index 378c7ad50..9850ebc9d 100644 --- a/js/ui/wanda.js +++ b/js/ui/wanda.js @@ -50,21 +50,12 @@ const WandaIcon = new Lang.Class({ }, createIcon: function(iconSize) { - if (this._animations) - this._animations.destroy(); - if (!this._imageFile) { return new St.Icon({ icon_name: 'face-smile', icon_size: iconSize }); } this._animations = St.TextureCache.get_default().load_sliced_image(this._imageFile, this._imgWidth, this._imgHeight); - this._animations.connect('destroy', Lang.bind(this, function() { - if (this._timeoutId) - GLib.source_remove(this._timeoutId); - this._timeoutId = 0; - this._animations = null; - })); this._animations.connect('notify::mapped', Lang.bind(this, function() { if (this._animations.mapped && !this._timeoutId) { this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, FISH_SPEED, Lang.bind(this, this._update));