From 57abc51aad272a656282a52a460a47abe24e07d6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 23:51:53 +0000 Subject: - 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 --- src/modules/skin/skinicons.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/modules/skin') diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 777cc19757..24138e0000 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -314,7 +314,7 @@ HICON LoadSkinProtoIcon(const char* szProto, int status, bool big) sid.pszName = iconName; sid.ptszDescription = cli.pfnGetStatusModeDescription(statusIcons[i].id, 0); sid.iDefaultIndex = statusIcons[i].resource_id; - IcoLib_AddNewIcon(&sid); + IcoLib_AddNewIcon(0, &sid); } } } } // format: core_status_%s%d @@ -364,12 +364,11 @@ static void convertOneProtocol(char* moduleName, char* iconName) { char* pm = moduleName + strlen(moduleName); char* pi = iconName + strlen(iconName); - DBVARIANT dbv; - int i; - for (i = 0; i < SIZEOF(statusIcons); i++) { + for (int i = 0; i < SIZEOF(statusIcons); i++) { _itoa(statusIcons[i].id, pm, 10); + DBVARIANT dbv; if ( !DBGetContactSettingTString(NULL, "Icons", moduleName, &dbv)) { _itoa(i, pi, 10); @@ -471,7 +470,7 @@ int LoadSkinIcons(void) sid.pszSection = mainIcons[i].section == NULL ? "Main Icons" : (char*)mainIcons[i].section; sid.pszDescription = (char*)mainIcons[i].description; sid.iDefaultIndex = mainIcons[i].resource_id; - hMainIcons[i] = IcoLib_AddNewIcon(&sid); + hMainIcons[i] = IcoLib_AddNewIcon(0, &sid); } // // Add global icons to list @@ -485,7 +484,7 @@ int LoadSkinIcons(void) sid.pszName = iconName; sid.pszDescription = (char*)statusIcons[i].description; sid.iDefaultIndex = statusIcons[i].resource_id; - hStatusIcons[i] = IcoLib_AddNewIcon(&sid); + hStatusIcons[i] = IcoLib_AddNewIcon(0, &sid); } return 0; } -- cgit v1.2.3