Removed wrong IcoLib_ReleaseIcon

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

1 files changed, 5 insertions, 27 deletions

diff --git a/plugins/ListeningTo/listeningto.cpp b/plugins/ListeningTo/listeningto.cpp
index a1359bea59..9a85a38c27 100644
--- a/plugins/ListeningTo/listeningto.cpp
+++ b/plugins/ListeningTo/listeningto.cpp
@@ -357,14 +357,11 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 		// Add main menu item

 		mi.position = 500080000;

-		mi.pszPopupName = (char*) -1;

-		mi.pszName = "Listening to";

-		mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB;

+		mi.ptszName = LPGENT("Listening to");

+		mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR;

 		mi.icolibItem = hIcon1;

 		hMainMenuGroup = Menu_AddMainMenuItem(&mi);

 

-		IcoLib_ReleaseIcon(mi.hIcon);

-

 		mi.hParentMenu = hMainMenuGroup;

 		mi.popupPosition = 500080000;

 		mi.position = 0;

@@ -372,8 +369,8 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		mi.hIcon = NULL;

 

 		// Add all protos

-		mi.pszName = Translate("Send to all protocols");

-		mi.flags = CMIF_CHILDPOPUP 

+		mi.ptszName = LPGENT("Send to all protocols");

+		mi.flags = CMIF_CHILDPOPUP  | CMIF_TCHAR

 				| (ListeningToEnabled(NULL, TRUE) ? CMIF_CHECKED : 0)

 				| (opts.enable_sending ? 0 : CMIF_GRAYED);

 		proto_itens.resize(1);

@@ -391,7 +388,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	{

 		PROTOACCOUNT **protos;

 		int count;

-		CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&protos);

+		ProtoEnumAccounts(&count,&protos);

 

 		for (int i = 0; i < count; i++)

 		{

@@ -405,25 +402,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 		hHooks.push_back( HookEvent(ME_PROTO_ACCLISTCHANGED, AccListChanged));

 	}

-	else

-	{

-		PROTOCOLDESCRIPTOR **protos;

-		int count;

-		CallService(MS_PROTO_ENUMPROTOCOLS, (WPARAM)&count, (LPARAM)&protos);

-

-		for (int i = 0; i < count; i++)

-		{

-			if (protos[i]->type != PROTOTYPE_PROTOCOL)

-				continue;

-

-			char name[128];

-			CallProtoService(protos[i]->szName, PS_GETNAME, sizeof(name), (LPARAM)name);

-

-			TCHAR *acc = mir_a2t(name);

-			RegisterProtocol(protos[i]->szName, acc);

-			mir_free(acc);

-		}

-	}

 

 	RebuildMenu();