[gnome-shell] popupMenu: Make destroy() a bit more robust

[Florian Müllner <fmuellner src gnome org>]

commit 3e7e88cd5f55db389b5afe22a5ccf808ba4f4d03
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Feb 15 00:32:45 2014 +0100

    popupMenu: Make destroy() a bit more robust
    
    Currently destroying a menu's actor and calling its destroy() method
    are subtly different - the latter will also result in the menu being
    removed from the corresponding menu manager.
    There is no good justification for that behavior, so make both actions
    behave the same.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724690

 js/ui/popupMenu.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 39b6a2a..bec38a0 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -111,6 +111,7 @@ const PopupBaseMenuItem = new Lang.Class({
 
         this.actor.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
         this.actor.connect('key-focus-out', Lang.bind(this, this._onKeyFocusOut));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
     },
 
     _getTopMenu: function() {
@@ -192,6 +193,9 @@ const PopupBaseMenuItem = new Lang.Class({
 
     destroy: function() {
         this.actor.destroy();
+    },
+
+    _onDestroy: function() {
         this.emit('destroy');
     },