diff options
Diffstat (limited to 'plugins/WhenWasIt/src')
| -rw-r--r-- | plugins/WhenWasIt/src/dlg_handlers.cpp | 6 | ||||
| -rw-r--r-- | plugins/WhenWasIt/src/notifiers.cpp | 4 | ||||
| -rw-r--r-- | plugins/WhenWasIt/src/services.cpp | 8 | ||||
| -rw-r--r-- | plugins/WhenWasIt/src/utils.cpp | 4 | 
4 files changed, 11 insertions, 11 deletions
diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index 37160995e2..db617c4d4f 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -325,7 +325,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara  							case IDC_PREVIEW:
  								{
 -									HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +									HANDLE hContact = db_find_first();
  									int dtb, age;
  									dtb = rand() % 11; //0..10
  									age = rand() % 50 + 1; //1..50
 @@ -902,7 +902,7 @@ void SetBirthdaysCount(HWND hWnd)  int LoadBirthdays(HWND hWnd, int bShowAll)
  {
 -	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +	HANDLE hContact = db_find_first();
  	HWND hList = GetDlgItem(hWnd, IDC_BIRTHDAYS_LIST);
  	//int bShowCurrentAge = DBGetContactSettingByte(NULL, ModuleName, "ShowCurrentAge", 0);
 @@ -913,7 +913,7 @@ int LoadBirthdays(HWND hWnd, int bShowAll)  		{
  			count = UpdateBirthdayEntry(hList, hContact, count, bShowAll, commonData.cShowAgeMode, 1); 
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +			hContact = db_find_next(hContact);
  		}
  	SetBirthdaysCount(hWnd);
 diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 102511cfaa..5b1e569ea2 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -329,7 +329,7 @@ int RefreshContactListIcons(HANDLE hContact)  //called with oldClistIcon != -1 from dlg_handlers whtn the extra icon slot changes.
  int RefreshAllContactListIcons(int oldClistIcon)
  {
 -	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +	HANDLE hContact = db_find_first();
  	while (hContact != NULL)
  		{
  			if (oldClistIcon != -1)
 @@ -337,7 +337,7 @@ int RefreshAllContactListIcons(int oldClistIcon)  					ClearClistIcon(hContact, oldClistIcon);
  				}
  			RefreshContactListIcons(hContact); //will change bBirthdayFound if needed
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +			hContact = db_find_next(hContact);
  		}
  	return 0;
  }
\ No newline at end of file diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index adc06de7b5..7fc5d22d52 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -221,12 +221,12 @@ DWORD WINAPI RefreshUserDetailsWorkerThread(LPVOID param)  	//PUAddPopUp(&pd);
  	ShowPopupMessage(TranslateT("WhenWasIt"), TranslateT("Starting to refresh user details"), hiRefreshUserDetails);
  	int delay = DBGetContactSettingWord(NULL, ModuleName, "UpdateDelay", REFRESH_DETAILS_DELAY);
 -	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +	HANDLE hContact = db_find_first();
  	int res;
  	while (hContact != NULL)
  		{
  			res = CallContactService(hContact, PSS_GETINFO, 0, 0);
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +			hContact = db_find_next(hContact);
  			if (hContact)
  				{
  					Sleep(delay); //sleep for a few seconds between requests
 @@ -391,7 +391,7 @@ int DoExport(TCHAR *fileName)  	_ftprintf(fout, _T("%c%s"), _T(COMMENT_CHAR), _T("This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n"));
 -	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +	HANDLE hContact = db_find_first();
  	int year, month, day;
  	TCHAR *szHandle;
  	char szProto[256];
 @@ -413,7 +413,7 @@ int DoExport(TCHAR *fileName)  					if (szHandle) free(szHandle);
  				}
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +			hContact = db_find_next(hContact);
  		}
  	fclose(fout);
 diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 6bfbcd326e..96a86ee8be 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -281,7 +281,7 @@ TCHAR *GetContactID(HANDLE hContact, char *szProto)  #pragma warning (disable: 4312)
  HANDLE GetContactFromID(TCHAR *szID, char *szProto)
  {
 -	HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
 +	HANDLE hContact = db_find_first();
  	TCHAR *szHandle;
  	char cProtocol[256];
 @@ -300,7 +300,7 @@ HANDLE GetContactFromID(TCHAR *szID, char *szProto)  				{
  					break;
  				}
 -			hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0);
 +			hContact = db_find_next(hContact);
  		}
  	return hContact;
  }
  | 
