MS_DB_EVENT_* services remained, but their calls removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@4255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 19 insertions, 34 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 5b466b98df..64a218848e 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -8,29 +8,23 @@ void populateSettingsList(HWND hwnd2List)
 	SendMessage(hwnd2List, LB_ADDSTRING, 0, (LPARAM)TranslateT("Reuse Pounce"));

 	SendMessage(hwnd2List, LB_ADDSTRING, 0, (LPARAM)TranslateT("Give Up delay"));

 	SendMessage(hwnd2List, LB_ADDSTRING, 0, (LPARAM)TranslateT("Confirmation Window"));

-//	SendMessage(hwnd2List, LB_ADDSTRING, 0, (LPARAM)"----------------------------"));

-//	SendMessage(hwnd2List, LB_ADDSTRING, 0, (LPARAM)Translate("Send a File"));

 }

 

 void populateContacts(HANDLE BPhContact,HWND hwnd2CB)

 {

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

-	while (hContact)

-	{

-		char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

-		if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM))

-		{

+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+		char *szProto = GetContactProto(hContact);

+		if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {

 			TCHAR name[300];

 			mir_sntprintf(name, SIZEOF(name), _T("%s (%s)"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR), _A2T(szProto));

 			int index = SendMessage(hwnd2CB, CB_ADDSTRING, 0, (LPARAM)name);

 			SendMessage(hwnd2CB, CB_SETITEMDATA, index, (LPARAM)hContact);

-			if (BPhContact == hContact) SendMessage(hwnd2CB, CB_SETCURSEL, index, 0);

+			if (BPhContact == hContact)

+				SendMessage(hwnd2CB, CB_SETCURSEL, index, 0);

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

 	}

 }

 

-

 void saveLastSetting(HANDLE hContact, HWND hwnd)

 {

 	TCHAR number[8];//, string[1024];//for sending file name

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 5dc859eb9b..77d86a0afc 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -72,18 +72,16 @@ int MsgAck(WPARAM wParam, LPARAM lParam)
 			DBEVENTINFO dbei = { 0 };

 			DBVARIANT dbv;

 			int reuse = db_get_b(ack->hContact,modname, "Reuse", 0);

-			if (!db_get_ts(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

-			{

-				char* pszUtf = mir_utf8encodeT(dbv.ptszVal);

+			if ( !db_get_ts(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

+				mir_ptr<char> pszUtf( mir_utf8encodeT(dbv.ptszVal));

 				dbei.cbSize = sizeof(dbei);

 				dbei.eventType = EVENTTYPE_MESSAGE;

 				dbei.flags = DBEF_UTF | DBEF_SENT;

 				dbei.szModule = (char*)ack->szModule;

 				dbei.timestamp = time(NULL);

 				dbei.cbBlob = lstrlenA(pszUtf) + 1;

-				dbei.pBlob = (PBYTE)pszUtf;

-				CallService(MS_DB_EVENT_ADD, (WPARAM)ack->hContact, (LPARAM)&dbei);

-				mir_free(pszUtf);

+				dbei.pBlob = (PBYTE)(char*)pszUtf;

+				db_event_add(ack->hContact, &dbei);

 			}

 			// check to reuse

 			if (reuse > 1)

@@ -162,31 +160,25 @@ void SendPounce(TCHAR *text, HANDLE hContact)
 

 int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)

 {

+	HANDLE hContact = (HANDLE)wParam;

 	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;

-	char* szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)wParam, 0);

+

+	char *szProto = GetContactProto(hContact);

 	if((HANDLE)wParam == NULL || strcmp(cws->szSetting,"Status")) return 0;

-	if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM))

-	{

+	if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {

 		int newStatus = cws->value.wVal;

 		int oldStatus = db_get_w((HANDLE)wParam,"UserOnline","OldStatus",ID_STATUS_OFFLINE);

 		

-		if ( ( newStatus != oldStatus ) && ( (HANDLE)wParam != NULL) && ( newStatus != ID_STATUS_OFFLINE)  ) 

-		{

-			HANDLE hContact = (HANDLE)wParam;

+		if (newStatus != oldStatus && wParam != NULL && newStatus != ID_STATUS_OFFLINE) {

 			DBVARIANT dbv;

-			if (!db_get_ts(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0'))

-			{

+			if (!db_get_ts(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

 				// check my status

 				if (statusCheck(db_get_w(hContact, modname, "SendIfMyStatusIsFLAG", 0), CallProtoService(szProto, PS_GETSTATUS,0,0)) 

 				// check the contacts status

-				&& statusCheck(db_get_w(hContact, modname, "SendIfTheirStatusIsFLAG", 0), newStatus) )

-				{

+				&& statusCheck(db_get_w(hContact, modname, "SendIfTheirStatusIsFLAG", 0), newStatus)) {

 					// check if we r giving up after x days

-					if (CheckDate(hContact))

-					{

-

-						if (db_get_b(hContact, modname, "ConfirmTimeout", 0))

-						{

+					if (CheckDate(hContact)) {

+						if (db_get_b(hContact, modname, "ConfirmTimeout", 0)) {

 							struct SendPounceDlgProcStruct *spdps = (struct SendPounceDlgProcStruct *)mir_alloc(sizeof(struct SendPounceDlgProcStruct));

 							TCHAR *message = mir_tstrdup(dbv.ptszVal); // will get free()ed in the send confirm window proc

 							spdps->hContact = hContact;

@@ -195,8 +187,7 @@ int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)
 							// set the confirmation window to send the msg when the timeout is done

 							mir_free(message);

 						}

-						else

-							SendPounce(dbv.ptszVal, hContact);

+						else SendPounce(dbv.ptszVal, hContact);

 					}

 				}

 				DBFreeVariant(&dbv);