5 files changed, 12 insertions, 12 deletions
diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp
index 0fdb48fb5f..b46a0d7249 100644
--- a/protocols/JabberG/src/jabber_agent.cpp
+++ b/protocols/JabberG/src/jabber_agent.cpp
@@ -56,7 +56,7 @@ public:
 			else
 				SetDlgItemText(m_hwnd, IDC_REG_STATUS, (TCHAR*)lParam);
 			if (wParam >= 0)
-				SendMessage(GetDlgItem(m_hwnd, IDC_PROGRESS_REG), PBM_SETPOS, wParam, 0);
+				SendDlgItemMessage(m_hwnd, IDC_PROGRESS_REG, PBM_SETPOS, wParam, 0);
 			if (wParam >= 100)
 				m_ok.SetText(TranslateT("OK"));
 		}
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 29cb943a52..77a96ba14a 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -726,7 +726,7 @@ public:
 
 		SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_CLIST), GWL_STYLE,
 			GetWindowLongPtr(GetDlgItem(m_hwnd, IDC_CLIST), GWL_STYLE)|CLS_HIDEOFFLINE|CLS_CHECKBOXES|CLS_HIDEEMPTYGROUPS|CLS_USEGROUPS|CLS_GREYALTERNATE|CLS_GROUPCHECKBOXES);
-		SendMessage(GetDlgItem(m_hwnd, IDC_CLIST), CLM_SETEXSTYLE, CLS_EX_DISABLEDRAGDROP|CLS_EX_TRACKSELECT, 0);
+		SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_SETEXSTYLE, CLS_EX_DISABLEDRAGDROP|CLS_EX_TRACKSELECT, 0);
 		ResetListOptions(&m_clc);
 		FilterList(&m_clc);
 	}
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 5c64d179c0..ec1062bc46 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -255,7 +255,7 @@ protected:
 			else
 				SetDlgItemText(m_hwnd, IDC_REG_STATUS, (TCHAR*)lParam);
 
-			SendMessage(GetDlgItem(m_hwnd, IDC_PROGRESS_REG), PBM_SETPOS, wParam, 0);
+			SendDlgItemMessage(m_hwnd, IDC_PROGRESS_REG, PBM_SETPOS, wParam, 0);
 			if (wParam >= 100)
 				m_btnOk.SetText(TranslateT("Close"));
 			else
diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index 49cde56897..aa6cabcbda 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -431,7 +431,7 @@ static void JabberSearchFreeData(HWND hwndDlg, JabberSearchData * dat)
 	if (dat->xNode)
 		xi.destroyNode(dat->xNode);
 
-	SendMessage(GetDlgItem(hwndDlg,IDC_FRAME), WM_SETFONT, (WPARAM)SendMessage(hwndDlg, WM_GETFONT, 0, 0),0);
+	SendDlgItemMessage(hwndDlg,IDC_FRAME, WM_SETFONT, (WPARAM)SendMessage(hwndDlg, WM_GETFONT, 0, 0),0);
 	dat->nJSInfCount=0;
 	ShowWindow(GetDlgItem(hwndDlg,IDC_VSCROLL),SW_HIDE);
 	SetDlgItemText(hwndDlg,IDC_INSTRUCTIONS,TranslateT("Select/type search service URL above and press <Go>"));
@@ -481,7 +481,7 @@ int CJabberProto::SearchRenewFields(HWND hwndDlg, JabberSearchData * dat)
 
 static void JabberSearchAddUrlToRecentCombo(HWND hwndDlg, const TCHAR *szAddr)
 {
-	int lResult = SendMessage(GetDlgItem(hwndDlg,IDC_SERVER), (UINT) CB_FINDSTRING, 0, (LPARAM)szAddr);
+	int lResult = SendDlgItemMessage(hwndDlg, IDC_SERVER, (UINT) CB_FINDSTRING, 0, (LPARAM)szAddr);
 	if (lResult == -1)
 		SendDlgItemMessage(hwndDlg, IDC_SERVER, CB_ADDSTRING, 0, (LPARAM)szAddr);
 }
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index 259c4f25dd..590b341425 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -63,8 +63,8 @@ static INT_PTR CALLBACK PersonalDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		if (lParam) {
 			ppro = (CJabberProto*)lParam;
 			TranslateDialogDefault(hwndDlg);
-			SendMessage(GetDlgItem(hwndDlg, IDC_GENDER), CB_ADDSTRING, 0, (LPARAM)TranslateT("Male"));
-			SendMessage(GetDlgItem(hwndDlg, IDC_GENDER), CB_ADDSTRING, 0, (LPARAM)TranslateT("Female"));
+			SendDlgItemMessage(hwndDlg, IDC_GENDER, CB_ADDSTRING, 0, (LPARAM)TranslateT("Male"));
+			SendDlgItemMessage(hwndDlg, IDC_GENDER, CB_ADDSTRING, 0, (LPARAM)TranslateT("Female"));
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
 			SendMessage(hwndDlg, WM_JABBER_REFRESH_VCARD, 0, 0);
 			ppro->WindowSubscribe(hwndDlg);
@@ -127,7 +127,7 @@ static INT_PTR CALLBACK HomeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			for (int i=0; i < g_cbCountries; i++)	{
 				if (g_countries[i].id != 0xFFFF && g_countries[i].id != 0) {
 					TCHAR *country = mir_a2t(g_countries[i].szName);
-					SendMessage(GetDlgItem(hwndDlg, IDC_COUNTRY), CB_ADDSTRING, 0, (LPARAM)TranslateTS(country));
+					SendDlgItemMessage(hwndDlg, IDC_COUNTRY, CB_ADDSTRING, 0, (LPARAM)TranslateTS(country));
 					mir_free(country);
 				}
 			}
@@ -190,7 +190,7 @@ static INT_PTR CALLBACK WorkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			for (int i=0; i < g_cbCountries; i++)	{
 				if (g_countries[i].id != 0xFFFF && g_countries[i].id != 0) {
 					TCHAR *country = mir_a2t(g_countries[i].szName);
-					SendMessage(GetDlgItem(hwndDlg, IDC_COUNTRY), CB_ADDSTRING, 0, (LPARAM)TranslateTS(country));
+					SendDlgItemMessage(hwndDlg, IDC_COUNTRY, CB_ADDSTRING, 0, (LPARAM)TranslateTS(country));
 					mir_free(country);
 				}
 			}
@@ -932,7 +932,7 @@ void CJabberProto::SaveVcardToDB(HWND hwndPage, int iPage)
 		setTString("LastName", text);
 		GetDlgItemText(hwndPage, IDC_BIRTH, text, SIZEOF(text));
 		setTString("BirthDate", text);
-		switch(SendMessage(GetDlgItem(hwndPage, IDC_GENDER), CB_GETCURSEL, 0, 0)) {
+		switch (SendDlgItemMessage(hwndPage, IDC_GENDER, CB_GETCURSEL, 0, 0)) {
 			case 0:	setString("GenderString", "Male");   break;
 			case 1:	setString("GenderString", "Female"); break;
 			default: setString("GenderString", "");       break;
@@ -956,7 +956,7 @@ void CJabberProto::SaveVcardToDB(HWND hwndPage, int iPage)
 		GetDlgItemText(hwndPage, IDC_ZIP, text, SIZEOF(text));
 		setTString("ZIP", text);
 		{
-			int i = SendMessage(GetDlgItem(hwndPage, IDC_COUNTRY), CB_GETCURSEL, 0, 0);
+			int i = SendDlgItemMessage(hwndPage, IDC_COUNTRY, CB_GETCURSEL, 0, 0);
 			TCHAR *country = mir_a2t((i) ? g_countries[i+2].szName : g_countries[1].szName);
 			setTString("Country", country);
 			mir_free(country);
@@ -982,7 +982,7 @@ void CJabberProto::SaveVcardToDB(HWND hwndPage, int iPage)
 		GetDlgItemText(hwndPage, IDC_ZIP, text, SIZEOF(text));
 		setTString("CompanyZIP", text);
 		{
-			int i = SendMessage(GetDlgItem(hwndPage, IDC_COUNTRY), CB_GETCURSEL, 0, 0);
+			int i = SendDlgItemMessage(hwndPage, IDC_COUNTRY, CB_GETCURSEL, 0, 0);
 			TCHAR *country = mir_a2t((i) ? g_countries[i+2].szName : g_countries[1].szName);
 			setTString("CompanyCountry", country);
 			mir_free(country);