diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-15 14:23:02 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-15 14:23:02 +0000 |
| commit | 3f9882178018afbe9aaaba1f4461f3fc75493260 (patch) | |
| tree | 50554bd4a21472624c94a859bfdc5e8758becd45 /plugins/StatusPlugins | |
| parent | 547ec570deb26f93fa4ab974a76c0e964a635586 (diff) | |
MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls
git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/StatusPlugins')
| -rw-r--r-- | plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 16 | ||||
| -rw-r--r-- | plugins/StatusPlugins/KeepStatus/options.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index b45f796a4c..7dc9711bb0 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -659,7 +659,7 @@ static VOID CALLBACK CheckConnectionTimer(HWND, UINT, UINT_PTR, DWORD) log_debugA("CheckConnectionTimer"); bool setStatus = false; if (showConnectionPopups) - hIcon = LoadSkinnedIcon(SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadIcon(SKINICON_STATUS_OFFLINE); for (int i = 0; i < connectionSettings.getCount() && !setStatus; i++) { TConnectionSettings& cs = connectionSettings[i]; @@ -672,7 +672,7 @@ static VOID CALLBACK CheckConnectionTimer(HWND, UINT, UINT_PTR, DWORD) if ((shouldBeStatus != realStatus) && (realStatus == ID_STATUS_OFFLINE) || (realStatus < MIN_STATUS)) { setStatus = true; if (showConnectionPopups) - hIcon = LoadSkinnedProtoIcon(cs.szName, ID_STATUS_OFFLINE); + hIcon = Skin_LoadProtoIcon(cs.szName, ID_STATUS_OFFLINE); } } @@ -893,7 +893,7 @@ static int ProcessPopup(int reason, LPARAM lParam) if (!db_get_b(NULL, MODULENAME, SETTING_PUOTHER, TRUE)) return -1; - hIcon = LoadSkinnedProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); mir_sntprintf(text, TranslateT("%s connected from another location"), GetHumanName(lParam)); break; @@ -901,7 +901,7 @@ static int ProcessPopup(int reason, LPARAM lParam) if (!db_get_b(NULL, MODULENAME, SETTING_PUOTHER, TRUE)) return -1; - hIcon = LoadSkinnedProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); if (db_get_b(NULL, MODULENAME, SETTING_LOGINERR, LOGINERR_NOTHING) == LOGINERR_CANCEL) mir_sntprintf(text, TranslateT("%s login error, cancel reconnecting"), GetHumanName(lParam)); else if (db_get_b(NULL, MODULENAME, SETTING_LOGINERR, LOGINERR_NOTHING) == LOGINERR_SETDELAY) @@ -915,7 +915,7 @@ static int ProcessPopup(int reason, LPARAM lParam) return -1; if (lParam) { // Указатель на имя модуля. - hIcon = LoadSkinnedProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); mir_sntprintf(text, TranslateT("%s status error (next retry (%d) in %d s)"), GetHumanName(lParam), retryCount + 1, currentDelay / 1000); } else mir_sntprintf(text, TranslateT("Status error (next retry (%d) in %d s)"), retryCount + 1, currentDelay / 1000); @@ -938,7 +938,7 @@ static int ProcessPopup(int reason, LPARAM lParam) } } } - hIcon = LoadSkinnedProtoIcon(ps[0]->szName, SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadProtoIcon(ps[0]->szName, SKINICON_STATUS_OFFLINE); rtrimt(protoInfo); if (retryCount == (maxRetries - 1)) @@ -963,14 +963,14 @@ static int ProcessPopup(int reason, LPARAM lParam) return -1; if (lParam) { - hIcon = LoadSkinnedIcon(SKINICON_STATUS_ONLINE); + hIcon = Skin_LoadIcon(SKINICON_STATUS_ONLINE); mir_sntprintf(text, TranslateT("Status was set ok")); } else mir_sntprintf(text, TranslateT("Giving up")); break; } if (hIcon == NULL) - hIcon = LoadSkinnedIcon(SKINICON_STATUS_OFFLINE); + hIcon = Skin_LoadIcon(SKINICON_STATUS_OFFLINE); log_info(L"KeepStatus: %s", text); return ShowPopup(text, hIcon); diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp index c533847b03..a5ecb7c2fe 100644 --- a/plugins/StatusPlugins/KeepStatus/options.cpp +++ b/plugins/StatusPlugins/KeepStatus/options.cpp @@ -479,7 +479,7 @@ INT_PTR CALLBACK PopupOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l POPUPDATAT ppd = { NULL };
ppd.lchContact = NULL;
- ppd.lchIcon = LoadSkinnedIcon(SKINICON_STATUS_OFFLINE);
+ ppd.lchIcon = Skin_LoadIcon(SKINICON_STATUS_OFFLINE);
_tcsncpy(ppd.lptzContactName, TranslateT("KeepStatus"), MAX_CONTACTNAME);
_tcsncpy(ppd.lptzText, TranslateT("You broke the Internet!"), MAX_SECONDLINE);
if (IsDlgButtonChecked(hwndDlg, IDC_WINCOLORS))
|