diff options
Diffstat (limited to 'plugins/TipperYM/src')
| -rw-r--r-- | plugins/TipperYM/src/options.cpp | 8 | ||||
| -rw-r--r-- | plugins/TipperYM/src/popwin.cpp | 8 | ||||
| -rw-r--r-- | plugins/TipperYM/src/subst.cpp | 4 | 
3 files changed, 10 insertions, 10 deletions
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index b106d76fac..0dfb831bc9 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -2104,14 +2104,14 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,  			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0);
  			HANDLE hContact, hItem;
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +			hContact = db_find_first();
  			while (hContact) 
  			{
  				hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
  				if (hItem && DBGetContactSettingByte(hContact, MODULE, "FavouriteContact", 0))
  					SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 1);
 -				hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +				hContact = db_find_next(hContact);
  			}
  			CheckDlgButton(hwndDlg, IDC_CHK_HIDEOFFLINE, opt.iFavoriteContFlags & FAVCONT_HIDE_OFFLINE);
 @@ -2129,7 +2129,7 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,  					BYTE isChecked;
  					int count = 0;
 -					hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +					hContact = db_find_first();
  					while (hContact) 
  					{
  						hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
 @@ -2140,7 +2140,7 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,  							if (isChecked) count++;
  						}
 -						hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +						hContact = db_find_next(hContact);
  					}
  					DBWriteContactSettingDword(0, MODULE, "FavouriteContactsCount", count);
 diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 964069ce2d..bf673f2da3 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -1769,7 +1769,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa  				if (dwItems & TRAYTIP_NUMCONTACTS)
  				{
  					int iCount = 0, iCountOnline = 0;
 -					HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +					HANDLE hContact = db_find_first();
  					while (hContact)
  					{
  						char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
 @@ -1779,7 +1779,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa  								iCountOnline++;
  							iCount++;
  						}
 -						hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
 +						hContact = db_find_next(hContact);
  					}
  					mir_sntprintf(buff, 64, _T("(%d/%d)"), iCountOnline, iCount);
  				} 
 @@ -1927,7 +1927,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa  					bool bTitlePainted = false;
  					int iCount = 0, iCountOnline = 0;
 -					HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +					HANDLE hContact = db_find_first();
  					while (hContact)
  					{
  						if (DBGetContactSettingByte(hContact, MODULE, "FavouriteContact", 0))
 @@ -1968,7 +1968,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa  								}
  							}
  						}
 -						hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +						hContact = db_find_next(hContact);
  					}
  					int index = pwd->iRowCount - 1;
 diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp index 1d8c8837d9..83d2408d74 100644 --- a/plugins/TipperYM/src/subst.cpp +++ b/plugins/TipperYM/src/subst.cpp @@ -915,11 +915,11 @@ TCHAR *GetProtoExtraStatusMessage(char *szProto)  		if (ServiceExists(MS_VARS_FORMATSTRING))
  		{		
 -			HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +			HANDLE hContact = db_find_first();
  			char *proto = ( char* )CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
  			while(!proto)
  			{
 -				hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
 +				hContact = db_find_next(hContact);
  				if (hContact) 
  				{
  					proto = ( char* )CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
  | 
