- 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

1 files changed, 4 insertions, 4 deletions

diff --git a/protocols/JabberG/jabber_icolib.cpp b/protocols/JabberG/jabber_icolib.cpp
index c85198a59c..12c9387ced 100644
--- a/protocols/JabberG/jabber_icolib.cpp
+++ b/protocols/JabberG/jabber_icolib.cpp
@@ -143,7 +143,7 @@ void CIconPool::RegisterIcon(const char *name, const char *filename, int iconid,
 	sid.ptszDescription = szDescription;

 	sid.flags = SIDF_TCHAR;

 	sid.iDefaultIndex = iconid;

-	item->m_hIcolibItem = (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+	item->m_hIcolibItem = Skin_AddIcon(&sid);

 

 	m_items.insert(item);

 }

@@ -294,7 +294,7 @@ void CJabberProto::IconsInit( void )
 		mir_snprintf( szSettingName, SIZEOF(szSettingName), "%s_%s", m_szModuleName, iconList[i].szName );

 

 		sid.iDefaultIndex = -iconList[i].defIconID;

-		m_phIconLibItems[i] = ( HANDLE )CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+		m_phIconLibItems[i] = Skin_AddIcon(&sid);

 }	}

 

 HANDLE CJabberProto::GetIconHandle( int iconId )

@@ -421,7 +421,7 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa
 		sid.pszDefaultFile=szMyPath;

 		sid.iDefaultIndex=i;

 		sid.flags = SIDF_TCHAR;

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

+		Skin_AddIcon(&sid);

 	}

 	return ((HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)IconName));

 }

@@ -690,7 +690,7 @@ static void sttProcessIcons( int iAmount )
 		sid.pszName = szSettingName;

 		sid.pszDescription = sharedIconList[i].szDescr;

 		sid.iDefaultIndex = -sharedIconList[i].defIconID;

-		sharedIconList[i].hIcon = ( HANDLE )CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);

+		sharedIconList[i].hIcon = Skin_AddIcon(&sid);

 }	}

 

 void g_IconsInit()