From 44e4cbf04a62ae9b7405c21859a1bb294da371f2 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 17 Feb 2013 20:02:09 -0500
Subject: [PATCH] popupMenu: Remove support for nested combo boxes

I'm sure this was originally a testcase for nested child
menus, and we never actually inteded any support for this.

https://bugzilla.gnome.org/show_bug.cgi?id=693572
---
 js/ui/popupMenu.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 5123696f3..eb3bd3076 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1682,9 +1682,7 @@ const PopupComboBoxMenuItem = new Lang.Class({
     _getTopMenu: function() {
         let actor = this.actor.get_parent();
         while (actor) {
-            if (actor._delegate &&
-                (actor._delegate instanceof PopupMenu ||
-                 actor._delegate instanceof PopupComboMenu))
+            if (actor._delegate && actor._delegate instanceof PopupMenu)
                 return actor._delegate;
 
             actor = actor.get_parent();