diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
| commit | d0ceb5768ff3146499a0318ffe03c867c0845592 (patch) | |
| tree | 984da5102d6a820e670323c47edd8187a37a0b33 /protocols/JabberG/src/jabber_vcard.cpp | |
| parent | 98ac258dc34b281e8441de847e37408c36c7415d (diff) | |
- numerous name conflicts resolved;
- funny code that loads resource #102 from miranda32.exe removed;
- massive mir_sntprintf code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_vcard.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_vcard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index d98e163758..7ab1794408 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -733,7 +733,7 @@ static INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lP ptrT email( ppro->getTStringA(idstr));
if (email == NULL) break;
- mir_sntprintf(number, _countof(number), _T("%d"), i+1);
+ mir_sntprintf(number, _T("%d"), i+1);
lvi.pszText = number;
lvi.lParam = (LPARAM)i;
ListView_InsertItem(GetDlgItem(hwndDlg, IDC_EMAILS), &lvi);
@@ -754,7 +754,7 @@ static INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lP ptrT phone( ppro->getTStringA(idstr));
if (phone == NULL) break;
- mir_sntprintf(number, _countof(number), _T("%d"), i+1);
+ mir_sntprintf(number, _T("%d"), i+1);
lvi.pszText = number;
lvi.lParam = (LPARAM)i;
ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);
@@ -880,7 +880,7 @@ static INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lP SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
else if (hti.iSubItem == 2) {
- EditDlgParam param = { lvi.lParam, ppro };
+ EditDlgParam param = { (int)lvi.lParam, ppro };
int res;
if (nm->hdr.idFrom == IDC_PHONES)
res = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_VCARD_ADDPHONE), hwndDlg, EditPhoneDlgProc, (LPARAM)¶m);
|