[orca] Fix for bug #640342 - Only defer to the toolkit script for an object if the app script is associated

[Joanmarie Diggs <joanied src gnome org>]

commit 1784562c95e3b93a7092596ee234982395b9fc15
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jan 23 15:39:02 2011 -0500

    Fix for bug #640342 - Only defer to the toolkit script for an object if the app script is associated with a different toolkit

 src/orca/script_manager.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index d9bba5d..49fa97e 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -202,6 +202,11 @@ class ScriptManager:
                     self.scripts[objToolkit] = script
                     _eventManager.registerListeners(script)
             if script:
+                # Only defer to the toolkit script for this object if the
+                # app script is based on a different toolkit.
+                appScript = self.scripts.get(app, self.getDefaultScript())
+                if issubclass(appScript.__class__, script.__class__):
+                    script = appScript
                 return script
 
         if not app: