- MS_SKIN2_ADDICON replaced with Skin_AddIcon;

- SKINICONDESC_SIZE* constants removed and replaced with sizeof(sid);
- added SIDF_PATH_UNICODE for all plugins;
- dynamic translation fixed in the icolib options dialog

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

3 files changed, 8 insertions, 9 deletions

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index a002af0f87..2e418dbb88 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -951,12 +951,11 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 	hiSessionsSave = LoadIcon(hinstance, MAKEINTRESOURCE(IDD_SESSIONS_SAVE));

 	hiSessionsLoadLast = LoadIcon(hinstance, MAKEINTRESOURCE(IDD_SESSIONS_LOADLAST));

 

-	hibChecked	  =(HANDLE)AddIcon(hiChecked, "SessionMarked", _T("Favorite Session"));

-	hibNotChecked =(HANDLE)AddIcon(hiNotChecked, "SessionUnMarked", _T("Not favorite Session"));

-

-	hibSessionsLoad		=(HANDLE)AddIcon(hiSessionsLoad, "SessionsLoad", _T("Load Session"));

-	hibSessionsSave		=(HANDLE)AddIcon(hiSessionsSave, "SessionsSave", _T("Save Session"));

-	hibSessionsLoadLast	=(HANDLE)AddIcon(hiSessionsLoadLast, "SessionsLoadLast", _T("Load last Session"));

+	hibChecked	  = AddIcon(hiChecked, "SessionMarked", LPGENT("Favorite Session"));

+	hibNotChecked = AddIcon(hiNotChecked, "SessionUnMarked", LPGENT("Not favorite Session"));

+	hibSessionsLoad = AddIcon(hiSessionsLoad, "SessionsLoad", LPGENT("Load Session"));

+	hibSessionsSave = AddIcon(hiSessionsSave, "SessionsSave", LPGENT("Save Session"));

+	hibSessionsLoadLast = AddIcon(hiSessionsLoadLast, "SessionsLoadLast", LPGENT("Load last Session"));

 

 	CLISTMENUITEM cl;

 	ZeroMemory(&cl, sizeof(cl));

diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp
index a4859e7874..26adc41513 100644
--- a/plugins/Sessions/Src/Utils.cpp
+++ b/plugins/Sessions/Src/Utils.cpp
@@ -535,7 +535,7 @@ BYTE IsMarkedUserDefSession(int ses_count)
 	return DBGetContactSettingByte(NULL, __INTERNAL_NAME, szSessionName, 0);

 }

 

-int AddIcon(HICON icon, char *name, TCHAR *description)

+HANDLE AddIcon(HICON icon, char *name, TCHAR *description)

 {

 	SKINICONDESC sid = {0};

 	sid.cbSize = sizeof(SKINICONDESC);

@@ -545,7 +545,7 @@ int AddIcon(HICON icon, char *name, TCHAR *description)
 	sid.ptszDescription = description;

 	sid.pszName = name;

 	sid.hDefaultIcon = icon;

-	return CallService(MS_SKIN2_ADDICON, 0, (LPARAM) &sid);

+	return Skin_AddIcon( &sid);

 }

 

 void SavePosition(HWND hwnd, char *wndName)

diff --git a/plugins/Sessions/Src/Utils.h b/plugins/Sessions/Src/Utils.h
index ce4fe75a59..f73dad00ad 100644
--- a/plugins/Sessions/Src/Utils.h
+++ b/plugins/Sessions/Src/Utils.h
@@ -33,7 +33,7 @@ int CheckForDuplicate(DWORD contact_list[],DWORD lparam);
 BOOL ResaveSettings(char* szName,int iFirst,int iLimit,TCHAR* pszPrevSetting);

 void OffsetWindow(HWND parent, HWND hwnd, int dx, int dy);

 int LoadSessionToCombobox (HWND hdlg,BOOL mode,int iLimit,char* pszSetting,int iFirstNum);

-int AddIcon(HICON icon, char *name, TCHAR *description);

+HANDLE AddIcon(HICON icon, char *name, TCHAR *description);

 int MarkUserDefSession(int ses_count,BYTE bCheck);

 BYTE IsMarkedUserDefSession(int ses_count);

 void SavePosition(HWND hWnd, char *wndName);