From e26ea67fde76cda8921df49b73c47fd247968b8e Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Mon, 14 Jul 2008 15:39:37 +0000
Subject: raise mirver (api) to 0x0800 don't check for file send service
 (accounts based protos don't have them)

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@422 4f64403b-2f21-0410-a795-97e2b3489a10
---
 metacontacts/meta_services.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'metacontacts/meta_services.c')

diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index cf42ef2..d61eea6 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -1686,31 +1686,38 @@ int Meta_FileSend(WPARAM wParam, LPARAM lParam)
 	{
 		// This is a simple contact
 		// (this should normally not happen, since linked contacts do not appear on the list.)
+		//PUShowMessage("meta has no default", SM_NOTIFY);
 		return 0;
 	}
 	else
 	{
 		HANDLE most_online;
         //DBEVENTINFO dbei;
-		char szServiceName[100];  
+		//char szServiceName[100];  
 
 		most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_FILESEND);
 
-		if(!most_online)
+		if(!most_online) {
+			//PUShowMessage("no most online for ft", SM_NOTIFY);
 			return 0;
+		}
 
 		proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0);
 		//Meta_CopyContactNick(ccs->hContact, most_online, proto);
 
 		if(proto) {
-			ccs->hContact = most_online;
+			//ccs->hContact = most_online;
 			//Meta_SetNick(proto);
 
-			_snprintf(szServiceName, sizeof(szServiceName), "%s%s", proto, PSS_FILE); 
-			if (ServiceExists(szServiceName)) {
-				return (int)(CallContactService(ccs->hContact, PSS_FILE, ccs->wParam, ccs->lParam));
-			}
-		}
+			// don't check for existence of service - 'accounts' based protos don't have them!
+			//_snprintf(szServiceName, sizeof(szServiceName), "%s%s", proto, PSS_FILE); 
+			//if (ServiceExists(szServiceName)) {
+			//	PUShowMessage("sending to subcontact", SM_NOTIFY);
+				return (int)(CallContactService(most_online, PSS_FILE, ccs->wParam, ccs->lParam));
+			//} else
+			//	PUShowMessage("no service", SM_NOTIFY);
+		} //else
+			//PUShowMessage("no proto for subcontact", SM_NOTIFY);
 	}
 	return 0; // fail
 }
-- 
cgit v1.2.3