- all icolib services removed;

- IcoLib_* functions are bound directly to the code

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

2 files changed, 4 insertions, 16 deletions

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index 71493e49f2..c474f0df33 100644
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -29,16 +29,6 @@ void InitIconLib()
 	Icon_Register(hInst, szGPGModuleName, iconList, SIZEOF(iconList));

 }

 

-HICON IconLibGetIcon(const char* ident)

-{

-	return Skin_GetIcon(ident);

-}

-

-void IconLibReleaseIcon(const char* ident)

-{

-	Skin_ReleaseIcon(ident);

-}

-

 HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook)

 {

 	return HookEvent(ME_SKIN2_ICONSCHANGED, hook);

@@ -63,14 +53,14 @@ void setSrmmIcon(MCONTACT h)
 

 	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = szGPGModuleName;

-	sid.hIcon = IconLibGetIcon("secured");

+	sid.hIcon = IcoLib_GetIcon("secured");

 	sid.dwId = 1;

 	sid.flags = enabled ? 0 : MBF_HIDDEN;

 	Srmm_ModifyIcon(hContact, &sid);

 	if(hMC != hContact)

 		Srmm_ModifyIcon(hMC, &sid);

 

-	sid.hIcon = IconLibGetIcon("unsecured");

+	sid.hIcon = IcoLib_GetIcon("unsecured");

 	sid.dwId = 2;

 	sid.flags = enabled ? MBF_HIDDEN : 0;

 	Srmm_ModifyIcon(hContact, &sid);

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 9c42ba7ae0..e3751ea52a 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -124,18 +124,16 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	if(!db_get_b(NULL, szGPGModuleName, "FirstRun", 1))

 		InitCheck();

 

-	HICON IconLibGetIcon(const char* ident);

-

 	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = szGPGModuleName;

 	sid.flags = MBF_HIDDEN;

 	sid.dwId = 0x00000001;

-	sid.hIcon = IconLibGetIcon("secured");

+	sid.hIcon = IcoLib_GetIcon("secured");

 	sid.szTooltip = LPGEN("GPG Turn off encryption");

 	Srmm_AddIcon(&sid);

 

 	sid.dwId = 0x00000002;

-	sid.hIcon = IconLibGetIcon("unsecured");

+	sid.hIcon = IcoLib_GetIcon("unsecured");

 	sid.szTooltip = LPGEN("GPG Turn on encryption");

 	Srmm_AddIcon(&sid);