3 files changed, 1 insertions, 10 deletions
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp
index 68f849dc23..403d196cfb 100644
--- a/plugins/SmileyAdd/src/general.cpp
+++ b/plugins/SmileyAdd/src/general.cpp
@@ -223,8 +223,7 @@ MCONTACT DecodeMetaContact(MCONTACT hContact)
 
 bool IsSmileyProto(char* proto)
 {
-	return proto && (!metaProtoName || strcmp(proto, metaProtoName)) &&
-		(CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
+	return proto && strcmp(proto, META_PROTO) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_IM | PF1_CHAT));
 }
 
 void ReportError(const TCHAR* errmsg)
diff --git a/plugins/SmileyAdd/src/general.h b/plugins/SmileyAdd/src/general.h
index 5d62528903..5abb9aeddd 100644
--- a/plugins/SmileyAdd/src/general.h
+++ b/plugins/SmileyAdd/src/general.h
@@ -88,7 +88,6 @@ typedef WCMatcher _TMatcher;
 #include "smltool.h"
 
 extern HINSTANCE g_hInst;
-extern char* metaProtoName;
 extern HANDLE hNetlibUser;
 extern HANDLE hEvent1;
 extern HGENMENU hContactMenuItem;
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp
index 7279cfac60..82e90f56bc 100644
--- a/plugins/SmileyAdd/src/main.cpp
+++ b/plugins/SmileyAdd/src/main.cpp
@@ -24,8 +24,6 @@ HINSTANCE g_hInst;
 HANDLE    hEvent1;
 HGENMENU  hContactMenuItem;
 
-char* metaProtoName;
-
 int hLangpack;
 
 static const PLUGININFOEX pluginInfoEx =
@@ -54,9 +52,6 @@ static int ModulesLoaded(WPARAM, LPARAM)
 {
 	Icon_Register(g_hInst, "SmileyAdd", &icon, 1);
 
-	INT_PTR temp = CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
-	metaProtoName = mir_strdup(temp == CALLSERVICE_NOTFOUND ? NULL : (char*)temp);
-
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_ROOTPOPUP;
 	mi.popupPosition = 2000070050;
@@ -143,8 +138,6 @@ extern "C" __declspec(dllexport) int Unload(void)
 	DestroyGdiPlus();
 
 	DownloadClose();
-
-	mir_free(metaProtoName);
 	return 0;
 }