• R/O
  • HTTP
  • SSH
  • HTTPS

xkeymacs: Commit


Commit MetaInfo

Revisionbc0b216879b553e287de63c8171b785721eed82a (tree)
Time2014-09-11 22:22:26
AuthorKazuhiro Fujieda <fujieda@user...>
CommiterKazuhiro Fujieda

Log Message

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.

Change Summary

Incremental Difference

--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -371,7 +371,7 @@ int CProfile::GetAppID(LPCTSTR appName)
371371 {
372372 int nAppID = 0;
373373 for (nAppID = 0; nAppID < MAX_APP; ++nAppID)
374- if (!_tcscmp(appName, m_Config.AppConfig[nAppID].AppName))
374+ if (!_tcsicmp(appName, m_Config.AppConfig[nAppID].AppName))
375375 break;
376376 return nAppID;
377377 }
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -186,11 +186,12 @@ void CProperties::AddItem(const CString& appTitle, const CString& appName)
186186 for (int i = 0; i < m_cAppList.GetCount(); ++i) {
187187 CString tmpTitle, tmpName;
188188 GetAppTitleAndName(i, tmpTitle, tmpName);
189- if (appName == tmpName)
189+ if (!appName.CompareNoCase(tmpName))
190190 return;
191191 }
192+ CString trimmed = CString(appTitle).Trim();
192193 CString item;
193- item.Format(IDS_APPLICATION_LIST_ITEM, appTitle, appName);
194+ item.Format(IDS_APPLICATION_LIST_ITEM, trimmed, appName);
194195 m_cAppList.AddString(item);
195196 }
196197
Show on old repository browser