[orca] Fix for bug 665216 - Remove Orca's support for Gecko-based Yelp v2

[Joanmarie Diggs <joanied src gnome org>]

commit 1e1dc3e36cc095de10f655ad9b05aa8039e263aa
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Nov 30 17:00:27 2011 +0100

    Fix for bug 665216 - Remove Orca's support for Gecko-based Yelp v2

 configure.ac                                       |    2 -
 src/orca/scripts/apps/yelp/Makefile.am             |    7 +-
 src/orca/scripts/apps/yelp/__init__.py             |   28 +---
 src/orca/scripts/apps/yelp/{yelp_v3 => }/script.py |    0
 src/orca/scripts/apps/yelp/yelp_v2/Makefile.am     |    9 -
 src/orca/scripts/apps/yelp/yelp_v2/__init__.py     |   28 ---
 src/orca/scripts/apps/yelp/yelp_v2/script.py       |  215 --------------------
 .../scripts/apps/yelp/yelp_v2/script_settings.py   |   29 ---
 .../scripts/apps/yelp/yelp_v2/script_utilities.py  |  106 ----------
 src/orca/scripts/apps/yelp/yelp_v3/Makefile.am     |    7 -
 src/orca/scripts/apps/yelp/yelp_v3/__init__.py     |   28 ---
 11 files changed, 4 insertions(+), 455 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9b5568f..d314cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,8 +120,6 @@ src/orca/scripts/apps/soffice/Makefile
 src/orca/scripts/apps/Thunderbird/Makefile
 src/orca/scripts/apps/xfwm4/Makefile
 src/orca/scripts/apps/yelp/Makefile
-src/orca/scripts/apps/yelp/yelp_v2/Makefile
-src/orca/scripts/apps/yelp/yelp_v3/Makefile
 src/orca/scripts/toolkits/Makefile
 src/orca/scripts/toolkits/Gecko/Makefile
 src/orca/scripts/toolkits/J2SE-access-bridge/Makefile
diff --git a/src/orca/scripts/apps/yelp/Makefile.am b/src/orca/scripts/apps/yelp/Makefile.am
index a31ac91..c2b213b 100644
--- a/src/orca/scripts/apps/yelp/Makefile.am
+++ b/src/orca/scripts/apps/yelp/Makefile.am
@@ -1,10 +1,7 @@
 orca_pathdir=$(pyexecdir)
 
 orca_python_PYTHON = \
-	__init__.py
+	__init__.py \
+	script.py
 
 orca_pythondir=$(pyexecdir)/orca/scripts/apps/yelp
-
-SUBDIRS = \
-	yelp_v2 \
-	yelp_v3
diff --git a/src/orca/scripts/apps/yelp/__init__.py b/src/orca/scripts/apps/yelp/__init__.py
index a57120f..ca2fdf1 100644
--- a/src/orca/scripts/apps/yelp/__init__.py
+++ b/src/orca/scripts/apps/yelp/__init__.py
@@ -17,7 +17,7 @@
 # Free Software Foundation, Inc., Franklin Street, Fifth Floor,
 # Boston MA  02110-1301 USA.
 
-""" Custom script for Yelp."""
+""" Custom script for Yelp v3."""
 
 __id__        = "$Id$"
 __version__   = "$Revision$"
@@ -25,28 +25,4 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2011 The Orca Team."
 __license__   = "LGPL"
 
-import sys
-
-import pyatspi
-from orca.script_utilities import Utilities
-
-def unloadYelpScript(version):
-    if 'orca.scripts.apps.yelp.yelp_' + version in sys.modules:
-        del(sys.modules['orca.scripts.apps.yelp.yelp_' + version])
-
-
-def getScript(app):
-    """Returns the correct version of the Yelp script based on toolkit."""
-    docFrames = Utilities.descendantsWithRole(app, pyatspi.ROLE_DOCUMENT_FRAME)
-    toolkit = ""
-    if docFrames:
-        attrs = dict([a.split(':', 1) for a in docFrames[0].getAttributes()])
-        toolkit = attrs.get('toolkit', '')
-
-    if toolkit == 'WebKitGtk':
-        unloadYelpScript('v2')
-        from yelp_v3 import script
-        return script.Script(app)
-    else:
-        from yelp_v2 import script
-        return script.Script(app)
+from script import Script
diff --git a/src/orca/scripts/apps/yelp/yelp_v3/script.py b/src/orca/scripts/apps/yelp/script.py
similarity index 100%
rename from src/orca/scripts/apps/yelp/yelp_v3/script.py
rename to src/orca/scripts/apps/yelp/script.py