From b0fe8b53b67d97a839e3e518882f0c8e839ffd9e Mon Sep 17 00:00:00 2001 From: sje Date: Wed, 17 Oct 2007 01:13:54 +0000 Subject: use 'GetActive', bug fixes for TempDefault db datatype git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@369 4f64403b-2f21-0410-a795-97e2b3489a10 --- meta2/api.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'meta2/api.cpp') diff --git a/meta2/api.cpp b/meta2/api.cpp index 281f671..6988215 100644 --- a/meta2/api.cpp +++ b/meta2/api.cpp @@ -59,20 +59,7 @@ int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) { //returns a handle to the 'most online' contact //added with meta2 (2007/10/4) int MetaAPI_GetActiveContact(WPARAM wParam, LPARAM lParam) { - HANDLE hMeta = (HANDLE)wParam, hActive = 0; - if(DBGetContactSettingByte(hMeta, MODULE, "ForceDefault", 0)) - hActive = (HANDLE)MetaAPI_GetDefault((WPARAM)hMeta, 0); - if(!hActive) { - if((hActive = (HANDLE)DBGetContactSettingDword(hMeta, MODULE, "ForceSend", 0)) == 0) { - if((hActive = (HANDLE)DBGetContactSettingDword(hMeta, MODULE, "TempDefault", 0)) == 0) { - hActive = Meta_GetMostOnline(hMeta); - if(ContactStatus(hActive, ContactProto(hActive)) == ID_STATUS_OFFLINE) { - hActive = Meta_GetMostOnlineSupporting(hMeta, PFLAGNUM_4, PF4_IMSENDOFFLINE); - } - } - } - } - return (int)hActive; + return (int)Meta_GetActive((HANDLE)wParam); } //gets the number of subcontacts for a metacontact @@ -109,7 +96,7 @@ int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) { if(DBWriteContactSettingByte((HANDLE)wParam, MODULE, "Default", (DWORD)lParam)) return 1; - DBWriteContactSettingByte(hMeta, MODULE, "TempDefault", 0); + DBWriteContactSettingDword(hMeta, MODULE, "TempDefault", 0); NotifyEventHooks(hEventDefaultChanged, wParam, (LPARAM)metaMap[hMeta][(int)lParam].handle()); return 0; @@ -131,7 +118,7 @@ int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) { if(DBWriteContactSettingByte(hMeta, MODULE, "Default", contact_num)) return 1; - DBWriteContactSettingByte(hMeta, MODULE, "TempDefault", 0); + DBWriteContactSettingDword(hMeta, MODULE, "TempDefault", 0); NotifyEventHooks(hEventDefaultChanged, wParam, lParam); return 0; -- cgit v1.2.3