- metacontacts are always present;

- added META_PROTO constant for mc module name;
- MS_MC_GETPROTOCOLNAME removed, because it always returns META_PROTO

git-svn-id: http://svn.miranda-ng.org/main/trunk@8319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 11 deletions

diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index 7de32e841b..377fe2880d 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -34,7 +34,6 @@ MTEXT_INTERFACE		MText = {0};
 HANDLE folderId;

 BOOL gbPopupLoaded  = FALSE;

 BOOL gbHppInstalled = FALSE;

-LPCSTR gszMetaProto = "";

 

 //===== Brushes, Colours and Fonts =====

 HBITMAP hbmNoAvatar;

diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h
index dcfcf7b0dd..89b670331c 100644
--- a/plugins/Popup/src/config.h
+++ b/plugins/Popup/src/config.h
@@ -138,8 +138,6 @@ extern HANDLE htuTitle;
 

 extern BOOL gbPopupLoaded;

 extern BOOL gbHppInstalled;

-extern LPCSTR gszMetaProto;

-

 

 //===== Brushes, Colours and Fonts =====

 extern HBITMAP hbmNoAvatar;

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 8523cdf518..752ac6765b 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -264,11 +264,6 @@ static int ModulesLoaded(WPARAM,LPARAM)
 	}

 	else htuTitle = htuText = NULL;

 

-	// init meta contacts

-	INT_PTR ptr = CallService(MS_MC_GETPROTOCOLNAME, 0, 0);

-	if (ptr != CALLSERVICE_NOTFOUND)

-		gszMetaProto = (LPCSTR)ptr;

-

 	//check if OptionLoaded

 	if (!OptionLoaded)

 		LoadOptions();

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index 4805337134..d824abb9b2 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -937,12 +937,12 @@ struct ReplyEditData
 	WNDPROC oldWndProc;

 };

 

-BOOL	IsUtfSendAvailable(MCONTACT hContact)

+BOOL IsUtfSendAvailable(MCONTACT hContact)

 {

 	char* szProto = GetContactProto(hContact);

 	if (szProto == NULL) return FALSE;

 	//check for MetaContact and get szProto from subcontact

-	if (strcmp(szProto, gszMetaProto)==0) {

+	if (!strcmp(szProto, META_PROTO)) {

 		MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, hContact, 0);

 		if (!hSubContact)

 			return FALSE;

@@ -951,7 +951,7 @@ BOOL	IsUtfSendAvailable(MCONTACT hContact)
 	return(CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDUTF) ? TRUE : FALSE;

 }

 

-void	AddMessageToDB(MCONTACT hContact, char *msg, int flag/*bool utf*/)

+void AddMessageToDB(MCONTACT hContact, char *msg, int flag/*bool utf*/)

 {

 	DBEVENTINFO dbei = {0};

 	dbei.cbSize = sizeof(dbei);