Index: gnome-orca-3.18.0/configure.ac
===================================================================
--- gnome-orca-3.18.0.orig/configure.ac
+++ gnome-orca-3.18.0/configure.ac
@@ -121,6 +121,7 @@ src/orca/scripts/apps/planner/Makefile
 src/orca/scripts/apps/rhythmbox/Makefile
 src/orca/scripts/apps/soffice/Makefile
 src/orca/scripts/apps/Thunderbird/Makefile
+src/orca/scripts/apps/unity/Makefile
 src/orca/scripts/apps/xfwm4/Makefile
 src/orca/scripts/toolkits/Makefile
 src/orca/scripts/web/Makefile
Index: gnome-orca-3.18.0/src/orca/scripts/apps/Makefile.am
===================================================================
--- gnome-orca-3.18.0.orig/src/orca/scripts/apps/Makefile.am
+++ gnome-orca-3.18.0/src/orca/scripts/apps/Makefile.am
@@ -32,6 +32,7 @@ SUBDIRS = \
 	rhythmbox \
 	soffice \
 	Thunderbird \
+	unity \
 	xfwm4
 
 orca_python_PYTHON = \
Index: gnome-orca-3.18.0/src/orca/scripts/apps/__init__.py
===================================================================
--- gnome-orca-3.18.0.orig/src/orca/scripts/apps/__init__.py
+++ gnome-orca-3.18.0/src/orca/scripts/apps/__init__.py
@@ -30,4 +30,5 @@ __all__ = ['Banshee',
            'rhythmbox',
            'soffice',
            'Thunderbird',
+           'unity',
            'xfwm4']
Index: gnome-orca-3.18.0/src/orca/scripts/apps/unity/Makefile.am
===================================================================
--- /dev/null
+++ gnome-orca-3.18.0/src/orca/scripts/apps/unity/Makefile.am
@@ -0,0 +1,6 @@
+orca_python_PYTHON = \
+	__init__.py \
+	script.py
+
+orca_pythondir=$(pkgpythondir)/scripts/apps/unity
+
Index: gnome-orca-3.18.0/src/orca/scripts/apps/unity/__init__.py
===================================================================
--- /dev/null
+++ gnome-orca-3.18.0/src/orca/scripts/apps/unity/__init__.py
@@ -0,0 +1 @@
+from .script import Script
Index: gnome-orca-3.18.0/src/orca/scripts/apps/unity/script.py
===================================================================
--- /dev/null
+++ gnome-orca-3.18.0/src/orca/scripts/apps/unity/script.py
@@ -0,0 +1,62 @@
+# Orca
+#
+# Copyright (C) 2013-2014 Igalia, S.L.
+#
+# Author: Joanmarie Diggs <jdiggs@igalia.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
+# Boston MA  02110-1301 USA.
+
+__id__        = "$Id$"
+__version__   = "$Revision$"
+__date__      = "$Date$"
+__copyright__ = "Copyright (c) 2015 Canonical Ltd."
+__license__   = "LGPL"
+
+import pyatspi
+
+import orca.orca as orca
+import orca.scripts.default as default
+import orca.speech as speech
+
+class Script(default.Script):
+
+    def __init__(self, app):
+        default.Script.__init__(self, app)
+
+    def onActiveDescendantChanged(self, event):
+        """Callback for object:active-descendant-changed accessibility events."""
+
+        if not event.any_data:
+            return
+
+        # Unity's result accessible object does not technically get focus, so
+        # we only check that its parent has focus.
+        if not event.source.getState().contains(pyatspi.STATE_FOCUSED):
+            return
+
+        if self.stopSpeechOnActiveDescendantChanged(event):
+            speech.stop()
+
+        if event.source.getState().contains(pyatspi.STATE_MANAGES_DESCENDANTS) and \
+           event.source.getRole() == pyatspi.ROLE_TOOL_BAR:
+            orca.setLocusOfFocus(event, event.any_data, True, True)
+
+    def locusOfFocusChanged(self, event, oldLocusOfFocus, newLocusOfFocus):
+        if event.source.getState().contains(pyatspi.STATE_MANAGES_DESCENDANTS) and \
+           event.source.getRole() == pyatspi.ROLE_TOOL_BAR:
+            default.Script.locusOfFocusChanged(self, event, None, newLocusOfFocus)
+        else:
+            default.Script.locusOfFocusChanged(self, event, oldLocusOfFocus, newLocusOfFocus)
