From 86802925857034fec1fbfb5c0eb668e996b0518d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 1 Dec 2012 08:43:08 +0000
Subject: finally mir_icons removed

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

(limited to 'plugins/Import/src')

diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index 3de2bee115..f06d0aa2b5 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "version.h"
 #include "resource.h"
 
-#include "..\..\Utils\mir_icons.h"
-
 int nImportOption;
 int nCustomOptions;
 
@@ -38,7 +36,8 @@ INT_PTR CALLBACK WizardDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lP
 static HWND hwndWizard = NULL;
 int hLangpack;
 
-PLUGININFOEX pluginInfo = {
+PLUGININFOEX pluginInfo =
+{
 	sizeof(PLUGININFOEX),
 	"Import contacts and messages",
 	__VERSION_DWORD,
@@ -47,8 +46,9 @@ PLUGININFOEX pluginInfo = {
 	"info@miranda-im.org",
 	"© 2000-2010 Martin Öberg, Richard Hughes, Dmitry Kuzkin, George Hazan",
 	"http://miranda-ng.org/",
-	UNICODE_AWARE,	//{2D77A746-00A6-4343-BFC5-F808CDD772EA}
-      {0x2d77a746, 0xa6, 0x4343, { 0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea }}
+	UNICODE_AWARE,
+	//{2D77A746-00A6-4343-BFC5-F808CDD772EA}
+	{0x2d77a746, 0xa6, 0x4343, { 0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea }}
 };
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
@@ -113,8 +113,20 @@ extern "C" __declspec(dllexport) int Load(void)
 
 	hImportService = CreateServiceFunction(IMPORT_SERVICE, ImportCommand);
 
-	hIcoHandle = IcoLib_Register("import_main", "Import", LPGEN("Import..."), IDI_IMPORT);
+	// icon
+	TCHAR tszFile[MAX_PATH];
+	GetModuleFileName(hInst, tszFile, MAX_PATH);
+
+	SKINICONDESC sid = { sizeof(sid) };
+	sid.flags = SIDF_PATH_TCHAR;
+	sid.ptszDefaultFile = tszFile;
+	sid.pszSection = "Import";
+	sid.pszName = "import_main";
+	sid.pszDescription = LPGEN("Import...");
+	sid.iDefaultIndex = -IDI_IMPORT;
+	hIcoHandle = Skin_AddIcon(&sid);
 	
+	// menu item
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.icolibItem = hIcoHandle;
 	mi.pszName = LPGEN("&Import...");
-- 
cgit v1.2.3