From 5a259dd6b0e51c8185f814545bbd9e75432de739 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Wed, 5 Sep 2012 23:10:41 +0200
Subject: [PATCH] GrabHelper: always navigate focus when grabbing

Users of GrabHelper.grab() espect that the actor parameter (or one of its
children) will receive focus, irrespective of the previous focus location.
This fixes the key focus on the chat entry when expanding the notification.

https://bugzilla.gnome.org/show_bug.cgi?id=683449
---
 js/ui/grabHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index a4392cc6b..7120043b8 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -170,7 +170,7 @@ const GrabHelper = new Lang.Class({
         if (params.grabFocus)
             this._grabFocusCount++;
 
-        if (hadFocus)
+        if (hadFocus || params.grabFocus)
             _navigateActor(newFocus);
 
         return true;