From 4ad68f3d27feb1307e76c0cf25617a0bcf9de507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 10 Jun 2012 21:18:00 +0000 Subject: FacebookRM sync git-svn-id: http://svn.miranda-ng.org/main/trunk@385 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/theme.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'protocols/FacebookRM/theme.cpp') diff --git a/protocols/FacebookRM/theme.cpp b/protocols/FacebookRM/theme.cpp index 88e0ab5498..c6712c37ee 100644 --- a/protocols/FacebookRM/theme.cpp +++ b/protocols/FacebookRM/theme.cpp @@ -37,7 +37,7 @@ static const icons[] = { "mind", LPGEN("Mind"), IDI_MIND }, { "authRevoke", LPGEN("Cancel friendship"), IDI_AUTH_REVOKE }, - //{ "authRevokeReq", LPGEN("Cancel friendship request"), IDI_AUTH_REVOKE }, + { "authRevokeReq", LPGEN("Cancel friendship request"), IDI_AUTH_REVOKE }, { "authAsk", LPGEN("Request friendship"), IDI_AUTH_ASK }, { "authGrant", LPGEN("Approve friendship"), IDI_AUTH_GRANT }, @@ -118,11 +118,11 @@ static FacebookProto * GetInstanceByHContact(HANDLE hContact) { char *proto = reinterpret_cast( CallService(MS_PROTO_GETCONTACTBASEPROTO, reinterpret_cast(hContact),0) ); - if (!proto) + if(!proto) return 0; for(int i=0; i( CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi) ); - /* mi.position=-2000006001; + mi.position=-2000006001; mi.icolibItem = GetIconHandle("authRevokeReq"); mi.pszName = GetIconDescription("authRevokeReq"); mi.pszService = "FacebookProto/CancelFriendshipRequest"; - g_hContactMenuSvc[CMI_AUTH_REVOKE_REQ] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::CancelFriendshipRequest>); - g_hContactMenuItems[CMI_AUTH_REVOKE_REQ] = reinterpret_cast( - CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi) ); */ + g_hContactMenuSvc[CMI_AUTH_CANCEL] = CreateServiceFunction(mi.pszService,GlobalService<&FacebookProto::OnCancelFriendshipRequest>); + g_hContactMenuItems[CMI_AUTH_CANCEL] = reinterpret_cast( + CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi) ); mi.position=-2000006002; mi.icolibItem = GetIconHandle("authAsk"); @@ -226,12 +226,12 @@ int FacebookProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam) { bool ctrlPressed = (GetKeyState(VK_CONTROL) & 0x8000) != 0; - BYTE type = DBGetContactSettingDword(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0); + BYTE type = DBGetContactSettingByte(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0); EnableMenuItem(g_hContactMenuItems[CMI_AUTH_ASK], ctrlPressed || type == FACEBOOK_CONTACT_NONE || !type); EnableMenuItem(g_hContactMenuItems[CMI_AUTH_GRANT], ctrlPressed || type == FACEBOOK_CONTACT_APPROVE); EnableMenuItem(g_hContactMenuItems[CMI_AUTH_REVOKE], ctrlPressed || type == FACEBOOK_CONTACT_FRIEND); - //EnableMenuItem(g_hContactMenuItems[CMI_AUTH_CANCEL], ctrlPressed || type == FACEBOOK_CONTACT_REQUEST); + EnableMenuItem(g_hContactMenuItems[CMI_AUTH_CANCEL], ctrlPressed || type == FACEBOOK_CONTACT_REQUEST); } return 0; -- cgit v1.2.3