Ignore minor differences in titles and file names

Microsoft Office IME 2010 returns different descriptions (with
trailing space or not) and file names (in upper or lower case)
whether just after installation or else. This workaround ignores
these differences.

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index 53b97b0..f01749b 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -371,7 +371,7 @@ int CProfile::GetAppID(LPCTSTR appName)
 {\r
        int nAppID = 0;\r
        for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
-               if (!_tcscmp(appName, m_Config.AppConfig[nAppID].AppName))\r
+               if (!_tcsicmp(appName, m_Config.AppConfig[nAppID].AppName))\r
                        break;\r
        return nAppID;\r
 }\r

diff --git a/xkeymacs/properties.cpp b/xkeymacs/properties.cpp
index 1a15614..2dc5733 100644 (file)
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -186,11 +186,12 @@ void CProperties::AddItem(const CString& appTitle, const CString& appName)
        for (int i = 0; i < m_cAppList.GetCount(); ++i) {\r
                CString tmpTitle, tmpName;\r
                GetAppTitleAndName(i, tmpTitle, tmpName);\r
-               if (appName == tmpName)\r
+               if (!appName.CompareNoCase(tmpName))\r
                        return;\r
        }\r
+       CString trimmed = CString(appTitle).Trim();\r
        CString item;\r
-       item.Format(IDS_APPLICATION_LIST_ITEM, appTitle, appName);\r
+       item.Format(IDS_APPLICATION_LIST_ITEM, trimmed, appName);\r
        m_cAppList.AddString(item);\r
 }\r
 \r