diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
| commit | 5161fd3fe53b85f579cfece81e25b562f1fa56ae (patch) | |
| tree | 3ac6979cd3774351cb68431da64ca014f1170e98 /protocols/MSN/msn_opts.cpp | |
| parent | ce6e5ab03d58151c4eda36d05a8436d337b2d3c0 (diff) | |
- event code standardization for protocols
- fix for EVENTTYPE_AUTHREQUEST processing
- protocols' custom CallService core removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_opts.cpp')
| -rw-r--r-- | protocols/MSN/msn_opts.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/MSN/msn_opts.cpp b/protocols/MSN/msn_opts.cpp index b2fd4a9f8c..b92e21ee5b 100644 --- a/protocols/MSN/msn_opts.cpp +++ b/protocols/MSN/msn_opts.cpp @@ -80,7 +80,7 @@ HICON LoadIconEx(const char* name, bool big) {
char szSettingName[100];
mir_snprintf(szSettingName, sizeof(szSettingName), "MSN_%s", name);
- return (HICON)MSN_CallService(MS_SKIN2_GETICON, big, (LPARAM)szSettingName);
+ return (HICON)CallService(MS_SKIN2_GETICON, big, (LPARAM)szSettingName);
}
HANDLE GetIconHandle(int iconId)
@@ -96,7 +96,7 @@ void ReleaseIconEx(const char* name, bool big) {
char szSettingName[100];
mir_snprintf(szSettingName, sizeof(szSettingName), "MSN_%s", name);
- MSN_CallService(big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)szSettingName);
+ CallService(big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)szSettingName);
}
INT_PTR CALLBACK DlgProcMsnServLists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -120,7 +120,7 @@ static INT_PTR CALLBACK DlgProcMsnOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP char tBuffer[MAX_PATH];
if (!proto->getStaticString(NULL, "Password", tBuffer, sizeof(tBuffer)))
{
- MSN_CallService(MS_DB_CRYPT_DECODESTRING, strlen(tBuffer)+1, (LPARAM)tBuffer);
+ CallService(MS_DB_CRYPT_DECODESTRING, strlen(tBuffer)+1, (LPARAM)tBuffer);
tBuffer[16] = 0;
SetDlgItemTextA(hwndDlg, IDC_PASSWORD, tBuffer);
}
@@ -161,7 +161,7 @@ static INT_PTR CALLBACK DlgProcMsnOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_COMMAND:
if (LOWORD(wParam) == IDC_NEWMSNACCOUNTLINK)
{
- MSN_CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");
return TRUE;
}
@@ -278,7 +278,7 @@ LBL_Continue: }
GetDlgItemTextA(hwndDlg, IDC_PASSWORD, password, sizeof(password));
- MSN_CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(password),(LPARAM)password);
+ CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(password),(LPARAM)password);
if (!proto->getString("Password", &dbv))
{
if (strcmp(password, dbv.pszVal))
@@ -601,7 +601,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L char tBuffer[MAX_PATH];
if (!proto->getStaticString(NULL, "Password", tBuffer, sizeof(tBuffer)))
{
- MSN_CallService(MS_DB_CRYPT_DECODESTRING, strlen(tBuffer)+1, (LPARAM)tBuffer);
+ CallService(MS_DB_CRYPT_DECODESTRING, strlen(tBuffer)+1, (LPARAM)tBuffer);
tBuffer[16] = 0;
SetDlgItemTextA(hwndDlg, IDC_PASSWORD, tBuffer);
}
@@ -619,7 +619,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L case WM_COMMAND:
if (LOWORD(wParam) == IDC_NEWMSNACCOUNTLINK)
{
- MSN_CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");
return TRUE;
}
@@ -649,7 +649,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L }
GetDlgItemTextA(hwndDlg, IDC_PASSWORD, password, sizeof(password));
- MSN_CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(password),(LPARAM)password);
+ CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(password),(LPARAM)password);
if (!proto->getString("Password", &dbv))
{
if (strcmp(password, dbv.pszVal))
|