From f1e6c9b63fc90e6fbbcfcef52912ad0fda768302 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 11 Aug 2014 15:17:20 +0000
Subject: import: clearance

git-svn-id: http://svn.miranda-ng.org/main/trunk@10156 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Import/src/main.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'plugins/Import/src/main.cpp')

diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index e7dcc6432d..1c90c5c792 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -28,7 +28,6 @@ int nCustomOptions;
 static HANDLE hImportService = NULL;
 
 HINSTANCE hInst;
-HANDLE hIcoHandle;
 INT_PTR CALLBACK WizardDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 static HWND hwndWizard = NULL;
@@ -105,22 +104,18 @@ static int OnExit(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static IconItem iconList[] = { 
-	{ LPGEN("Import..."), "import_main", IDI_IMPORT }
-};
-
 extern "C" __declspec(dllexport) int Load(void)
 {
 	mir_getLP( &pluginInfo );
 
 	hImportService = CreateServiceFunction(IMPORT_SERVICE, ImportCommand);
 
-	// icon
-	Icon_Register(hInst, "Import", iconList, SIZEOF(iconList));
+	RegisterIcons();
 	
 	// menu item
-	CLISTMENUITEM mi = { sizeof(mi) };
-	mi.icolibItem = iconList[0].hIcolib;
+	CLISTMENUITEM mi = { 0 };
+	mi.cbSize = sizeof(mi);
+	mi.icolibItem = GetIconHandle(IDI_IMPORT);
 	mi.pszName = LPGEN("&Import...");
 	mi.position = 500050000;
 	mi.pszService = IMPORT_SERVICE;
@@ -141,8 +136,6 @@ extern "C" __declspec(dllexport) int Load(void)
 
 extern "C" __declspec(dllexport) int Unload(void)
 {
-	if (hImportService)
-		DestroyServiceFunction(hImportService);
-
+	DestroyServiceFunction(hImportService);
 	return 0;
 }
-- 
cgit v1.2.3