[orca] Rename the "CALLY" toolkit script "clutter"

[Joanmarie Diggs <joanied src gnome org>]

commit 7c8eafd9d0f78c1df68e2d16cd1210eaade5896d
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sat Nov 16 15:59:26 2013 -0500

    Rename the "CALLY" toolkit script "clutter"

 configure.ac                                       |    2 +-
 src/orca/script_manager.py                         |   10 ----------
 src/orca/scripts/toolkits/Makefile.am              |    2 +-
 src/orca/scripts/toolkits/__init__.py              |    2 +-
 .../toolkits/{CALLY => clutter}/Makefile.am        |    2 +-
 .../toolkits/{CALLY => clutter}/__init__.py        |    0
 .../toolkits/{CALLY => clutter}/formatting.py      |    0
 .../scripts/toolkits/{CALLY => clutter}/script.py  |    2 +-
 8 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8277d72..5818c6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@ src/orca/scripts/apps/xfwm4/Makefile
 src/orca/scripts/toolkits/Makefile
 src/orca/scripts/toolkits/Gecko/Makefile
 src/orca/scripts/toolkits/J2SE-access-bridge/Makefile
-src/orca/scripts/toolkits/CALLY/Makefile
+src/orca/scripts/toolkits/clutter/Makefile
 src/orca/scripts/toolkits/GAIL/Makefile
 src/orca/scripts/toolkits/Qt/Makefile
 src/orca/scripts/toolkits/WebKitGtk/Makefile
diff --git a/src/orca/script_manager.py b/src/orca/script_manager.py
index febee6c..06cad9f 100644
--- a/src/orca/script_manager.py
+++ b/src/orca/script_manager.py
@@ -62,8 +62,6 @@ class ScriptManager:
              'Nereid':           'Banshee',
              'vte':              'gnome-terminal',
              'gnome-terminal-server': 'gnome-terminal'}
-        self._toolkitNames = \
-            {'clutter':          'CALLY'}
 
         self.setActiveScript(None, "__init__")
         debug.println(debug.LEVEL_FINEST, 'INFO: Script manager initialized')
@@ -144,14 +142,6 @@ class ScriptManager:
         if not (app and name):
             return None
 
-        altNames = list(self._toolkitNames.keys())
-        names = [n for n in altNames if n.lower() == name.lower()]
-        if names:
-            newName = self._toolkitNames.get(names[0])
-            debug.println(debug.LEVEL_FINEST,
-                          "mapped %s to %s" % (name, newName))
-            name = newName
-
         script = None
         for package in self._scriptPackages:
             moduleName = '.'.join((package, name))
diff --git a/src/orca/scripts/toolkits/Makefile.am b/src/orca/scripts/toolkits/Makefile.am
index 81eb10e..9c12910 100644
--- a/src/orca/scripts/toolkits/Makefile.am
+++ b/src/orca/scripts/toolkits/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = Gecko J2SE-access-bridge CALLY GAIL Qt WebKitGtk gtk
+SUBDIRS = GAIL Gecko J2SE-access-bridge Qt WebKitGtk clutter gtk
 
 orca_python_PYTHON = \
        __init__.py \
diff --git a/src/orca/scripts/toolkits/__init__.py b/src/orca/scripts/toolkits/__init__.py
index 3fd625d..827c989 100644
--- a/src/orca/scripts/toolkits/__init__.py
+++ b/src/orca/scripts/toolkits/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ['CALLY',
+__all__ = ['clutter',
            'gtk',
            'GAIL',
            'Gecko',
diff --git a/src/orca/scripts/toolkits/CALLY/Makefile.am b/src/orca/scripts/toolkits/clutter/Makefile.am
similarity index 54%
rename from src/orca/scripts/toolkits/CALLY/Makefile.am
rename to src/orca/scripts/toolkits/clutter/Makefile.am
index 71118c0..1a1c1b4 100644
--- a/src/orca/scripts/toolkits/CALLY/Makefile.am
+++ b/src/orca/scripts/toolkits/clutter/Makefile.am
@@ -3,5 +3,5 @@ orca_python_PYTHON = \
        formatting.py \
        script.py
 
-orca_pythondir=$(pkgpythondir)/scripts/toolkits/CALLY
+orca_pythondir=$(pkgpythondir)/scripts/toolkits/clutter
 
diff --git a/src/orca/scripts/toolkits/CALLY/__init__.py b/src/orca/scripts/toolkits/clutter/__init__.py
similarity index 100%
rename from src/orca/scripts/toolkits/CALLY/__init__.py
rename to src/orca/scripts/toolkits/clutter/__init__.py
diff --git a/src/orca/scripts/toolkits/CALLY/formatting.py b/src/orca/scripts/toolkits/clutter/formatting.py
similarity index 100%
rename from src/orca/scripts/toolkits/CALLY/formatting.py
rename to src/orca/scripts/toolkits/clutter/formatting.py
diff --git a/src/orca/scripts/toolkits/CALLY/script.py b/src/orca/scripts/toolkits/clutter/script.py
similarity index 99%
rename from src/orca/scripts/toolkits/CALLY/script.py
rename to src/orca/scripts/toolkits/clutter/script.py
index c013216..d97715b 100644
--- a/src/orca/scripts/toolkits/CALLY/script.py
+++ b/src/orca/scripts/toolkits/clutter/script.py
@@ -1,6 +1,6 @@
 # Orca
 #
-# Copyright (C) 2010-2012 Igalia, S.L.
+# Copyright (C) 2010-2013 Igalia, S.L.
 #
 # Author: Alejandro Pinheiro Iglesias <apinheiro igalia com>
 # Author: Joanmarie Diggs <jdiggs igalia com>