From 13c033c257f6c083b0c46b4fa28601db5a0b6335 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Feb 2014 20:50:07 +0000
Subject: MS_MC_GETMETACONTACT => db_mc_getMeta

git-svn-id: http://svn.miranda-ng.org/main/trunk@8317 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MenuItemEx/src/main.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'plugins/MenuItemEx')

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index cb04157a35..39d6549624 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -20,7 +20,7 @@ HGENMENU hmenuVis,hmenuOff,hmenuHide,hmenuIgnore,hmenuProto,hmenuAdded,hmenuAuth
 HGENMENU hmenuCopyID,hmenuRecvFiles,hmenuStatusMsg,hmenuCopyIP,hmenuCopyMirVer;
 static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS];
 HICON hIcon[5];
-BOOL bMetaContacts = FALSE, bPopupService = FALSE;
+BOOL bPopupService = FALSE;
 PROTOACCOUNT **accs;
 OPENOPTIONSDIALOG ood;
 int protoCount;
@@ -261,28 +261,21 @@ void CopyToClipboard(HWND hwnd,LPSTR pszMsg, LPTSTR ptszMsg)
 
 BOOL isMetaContact(MCONTACT hContact)
 {
-	char *proto;
-	if (bMetaContacts) {
-		proto = GetContactProto(hContact);
-		if ( lstrcmpA(proto, "MetaContacts") == 0 ) {
-			return TRUE;
-		}
-	}
+	char *proto = GetContactProto(hContact);
+	if (lstrcmpA(proto, "MetaContacts") == 0)
+		return TRUE;
+
 	return FALSE;
 }
 
 MCONTACT getDefaultContact(MCONTACT hContact)
 {
-	if (bMetaContacts)
-		return (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, hContact, 0);
-	return 0;
+	return (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, hContact, 0);
 }
 
 MCONTACT getMostOnline(MCONTACT hContact)
 {
-	if (bMetaContacts)
-		return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);
-	return 0;
+	return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);
 }
 
 void GetID(MCONTACT hContact, LPSTR szProto, LPSTR szID)
@@ -980,7 +973,6 @@ static int ContactWindowOpen(WPARAM wparam, LPARAM lParam)
 static int ModuleLoad(WPARAM wParam, LPARAM lParam)
 {
 	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);
-	bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT);
 	return 0;
 }
 
-- 
cgit v1.2.3