From 1fb0cd07fba1e8d6f9ac2ebe3b4f2e1c60acb81b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Feb 2014 21:51:46 +0000 Subject: - 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 --- plugins/NewXstatusNotify/src/main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 6c9f024712..bcdfbaad92 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -28,7 +28,6 @@ LIST eventList( 10 ); HANDLE hStatusModeChange, hServiceMenu, hHookContactStatusChanged, hToolbarButton; HGENMENU hEnableDisableMenu; -char szMetaModuleName[256] = {0}; STATUS StatusList[STATUS_COUNT]; HWND SecretWnd; int hLangpack; @@ -775,7 +774,7 @@ int ContactStatusChanged(WPARAM hContact, LPARAM lParam) db_set_w(hContact, "SeenModule", "Status", oldStatus); } - if (strcmp(szProto, szMetaModuleName) == 0) { //this contact is Meta + if (!strcmp(szProto, META_PROTO)) { //this contact is Meta MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0); hlpProto = GetContactProto(hSubContact); if (hlpProto == NULL) @@ -1138,9 +1137,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) if (IsAccountEnabled(accounts[i])) db_set_b(NULL, MODULE, accounts[i]->szModuleName, 0); - if (ServiceExists(MS_MC_GETPROTOCOLNAME)) - strcpy(szMetaModuleName, (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0)); - return 0; } -- cgit v1.2.3