3 files changed, 5 insertions, 18 deletions
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr
index e8c4e2a2a7..389f364021 100644
--- a/plugins/HistoryPlusPlus/historypp.dpr
+++ b/plugins/HistoryPlusPlus/historypp.dpr
@@ -209,8 +209,7 @@ begin
     UnhookEvent(HookSmAddChanged);
   UnhookEvent(HookIcon2Changed);
   UnhookEvent(HookFSChanged);
-  if MetaContactsEnabled then
-    UnhookEvent(HookMetaDefaultChanged);
+  UnhookEvent(HookMetaDefaultChanged);
 
   try
     // destroy hidden main window
@@ -308,7 +307,7 @@ begin
   if SmileyAddEnabled    then HookSmAddChanged := HookEvent(ME_SMILEYADD_OPTIONSCHANGED,OnSmAddSettingsChanged);
   HookIcon2Changed := HookEvent(ME_SKIN2_ICONSCHANGED,OnIcon2Changed);
   HookFSChanged := HookEvent(ME_FONT_RELOAD,OnFSChanged);
-  if MetaContactsEnabled then HookMetaDefaultChanged := HookEvent(ME_MC_DEFAULTTCHANGED,OnMetaDefaultChanged);
+  HookMetaDefaultChanged := HookEvent(ME_MC_DEFAULTTCHANGED,OnMetaDefaultChanged);
 
   // return successfully
   Result:=0;
@@ -382,7 +381,7 @@ begin
     ((szProto = nil) or (StrComp(cws.szModule, szProto) <> 0)) then
     exit;
 
-  if MetaContactsEnabled and (StrComp(cws.szModule, pAnsiChar(MetaContactsProto)) = 0) and
+  if (StrComp(cws.szModule, META_PROTO) = 0) and
     (StrComp(cws.szSetting, 'Nick') = 0) then
     exit;
 
diff --git a/plugins/HistoryPlusPlus/hpp_contacts.pas b/plugins/HistoryPlusPlus/hpp_contacts.pas
index a9a4cd5e93..d0beee248b 100644
--- a/plugins/HistoryPlusPlus/hpp_contacts.pas
+++ b/plugins/HistoryPlusPlus/hpp_contacts.pas
@@ -73,7 +73,7 @@ end;
 function GetContactProto(hContact: THandle; var SubContact: THandle; var SubProtocol: AnsiString): AnsiString;
 begin
   Result := PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0));
-  if MetaContactsEnabled and (Result = MetaContactsProto) then
+  if (Result = META_PROTO) then
   begin
     SubContact := CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);
     SubProtocol := PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO, SubContact, 0));
diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas
index 350ddba32a..15f78b5e70 100644
--- a/plugins/HistoryPlusPlus/hpp_options.pas
+++ b/plugins/HistoryPlusPlus/hpp_options.pas
@@ -230,8 +230,6 @@ var
   GridOptions: TGridOptions;
   SmileyAddEnabled: Boolean;
   MathModuleEnabled: Boolean;
-  MetaContactsEnabled: Boolean;
-  MetaContactsProto: AnsiString;
   MeSpeakEnabled: Boolean;
   ShowHistoryCount: Boolean;
   hppIcons: array of ThppIntIconsRec;
@@ -553,7 +551,6 @@ var
   // sarc: SMADD_REGCAT;
   i: Integer;
   mt: TMessageType;
-  str: PAnsiChar;
   hppIconPack: String;
 begin
   // Register in IcoLib
@@ -625,16 +622,7 @@ begin
     end; }
   // Register in MathModule
   MathModuleEnabled := boolean(ServiceExists(MATH_RTF_REPLACE_FORMULAE));
-  // Checking MetaContacts
-  MetaContactsEnabled := boolean(ServiceExists(MS_MC_GETMOSTONLINECONTACT));
-  if MetaContactsEnabled then
-  begin
-    str := PAnsiChar(CallService(MS_MC_GETPROTOCOLNAME, 0, 0));
-    if Assigned(str) then
-      MetaContactsProto := AnsiString(str)
-    else
-      MetaContactsEnabled := false;
-  end;
+
   // Checking presence of speech api
   MeSpeakEnabled := boolean(ServiceExists(MS_SPEAK_SAY_W)) or
     boolean(ServiceExists(MS_SPEAK_SAY_A));