diff options
Diffstat (limited to 'src/modules/skin')
| -rw-r--r-- | src/modules/skin/hotkeys.cpp | 6 | ||||
| -rw-r--r-- | src/modules/skin/skinicons.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index 613ab96bd6..bafb4f5d42 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -171,7 +171,7 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) item->pszService = desc->pszService ? mir_strdup(desc->pszService) : 0;
item->DefHotkey = desc->DefHotKey & ~HKF_MIRANDA_LOCAL;
- item->Hotkey = DBGetContactSettingWord(NULL, DBMODULENAME, item->pszName, item->DefHotkey);
+ item->Hotkey = db_get_w(NULL, DBMODULENAME, item->pszName, item->DefHotkey);
item->type = item->pszService ?
(THotkeyType)db_get_b(NULL, DBMODULENAME "Types", item->pszName,
(desc->DefHotKey & HKF_MIRANDA_LOCAL) ? HKT_LOCAL : HKT_GLOBAL) : HKT_MANUAL;
@@ -196,7 +196,7 @@ static INT_PTR svcHotkeyRegister(WPARAM wParam, LPARAM lParam) count = (int)db_get_dw(NULL, DBMODULENAME, buf, -1);
for (i=0; i < count; i++) {
mir_snprintf(buf, SIZEOF(buf), "%s$%d", item->pszName, i);
- if ( !DBGetContactSettingWord(NULL, DBMODULENAME, buf, 0))
+ if ( !db_get_w(NULL, DBMODULENAME, buf, 0))
continue;
svcHotkeyRegister(wParam, lParam);
@@ -374,7 +374,7 @@ int LoadSkinHotkeys(void) mir_snprintf(szSetting, SIZEOF(szSetting), "HK%s", oldSettings[i]);
WORD key;
- if ((key = DBGetContactSettingWord(NULL, "Clist", szSetting, 0))) {
+ if ((key = db_get_w(NULL, "Clist", szSetting, 0))) {
DBDeleteContactSetting(NULL, "Clist", szSetting);
DBWriteContactSettingWord(NULL, DBMODULENAME, newSettings[i], key);
}
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index b948151dac..44e911c468 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -412,7 +412,7 @@ int LoadSkinIcons(void) SKINICONDESC sid;
int i, j = 0;
char iconName[MAX_PATH], moduleName[MAX_PATH];
- TCHAR modulePath[MAX_PATH];
+ TCHAR modulePath[MAX_PATH];
DBVARIANT dbv;
//
@@ -461,7 +461,7 @@ int LoadSkinIcons(void) sid.cbSize = sizeof(sid);
GetModuleFileName(NULL, modulePath, SIZEOF(modulePath));
sid.ptszDefaultFile = modulePath;
- sid.flags = SIDF_PATH_TCHAR;
+ sid.flags = SIDF_PATH_TCHAR;
sid.pszName = iconName;
//
|