Backport of 1.5:

Get rid of incorrect use of OSAGetCurrentDialect. Fixes #884085.

diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c
index 2d8b1e2db7639d91f0181550a8d04be44788e3ae..834f5e07bd0492b7f97b6857b3d29b96c3a32ab9 100644 (file)
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -32,8 +32,6 @@ PyOSA_GetAppTerminology(PyObject* self, PyObject* args)
        defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr');
        err = GetComponentInstanceError (defaultComponent);
        if (err) return PyMac_Error(err);
-       err = OSAGetCurrentDialect(defaultComponent, &defaultTerminology);
-       if (err) return PyMac_Error(err);       
        err = OSAGetAppTerminology (
        defaultComponent, 
        modeFlags,
@@ -63,8 +61,6 @@ PyOSA_GetSysTerminology(PyObject* self, PyObject* args)
        defaultComponent = OpenDefaultComponent (kOSAComponentType, 'ascr');
        err = GetComponentInstanceError (defaultComponent);
        if (err) return PyMac_Error(err);
-       err = OSAGetCurrentDialect(defaultComponent, &defaultTerminology);
-       if (err) return PyMac_Error(err);       
        err = OSAGetAppTerminology (
        defaultComponent, 
        modeFlags,