summaryrefslogtreecommitdiff
path: root/plugins/YAMN
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-12-01 20:32:13 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-12-01 20:32:13 +0000
commit1860018b201d995ed051c0affb72d5a1d09fa02e (patch)
tree1ee096c43578fdf5694e5487d672830f810f186c /plugins/YAMN
parent7300094417302d82aa4f3f6e469f91d8facf4f26 (diff)
SKINICONDESC initialization - end of story
git-svn-id: http://svn.miranda-ng.org/main/trunk@2598 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/YAMN')
-rw-r--r--plugins/YAMN/src/main.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 866fdfbd2c..b935f2134f 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -243,7 +243,7 @@ int SystemModulesLoaded(WPARAM, LPARAM)
struct TIconListItem
{
- TCHAR* szDescr;
+ char* szDescr;
char* szName;
int defIconID;
HANDLE hIcon;
@@ -252,10 +252,10 @@ struct TIconListItem
static TIconListItem iconList[] =
{
- {LPGENT("Check mail"), "YAMN_Check", IDI_CHECKMAIL, 0},
- {LPGENT("Launch application"), "YAMN_Launch", IDI_LAUNCHAPP, 0},
- {LPGENT("New Mail"), "YAMN_NewMail", IDI_NEWMAIL, 0},
- {LPGENT("Connect Fail"), "YAMN_ConnectFail", IDI_BADCONNECT, 0},
+ { LPGEN("Check mail"), "YAMN_Check", IDI_CHECKMAIL, 0 },
+ { LPGEN("Launch application"), "YAMN_Launch", IDI_LAUNCHAPP, 0 },
+ { LPGEN("New Mail"), "YAMN_NewMail", IDI_NEWMAIL, 0 },
+ { LPGEN("Connect Fail"), "YAMN_ConnectFail", IDI_BADCONNECT, 0 },
};
static void LoadIcons()
@@ -263,16 +263,14 @@ static void LoadIcons()
TCHAR szFile[MAX_PATH];
GetModuleFileName(YAMNVar.hInst, szFile, MAX_PATH);
- SKINICONDESC sid = {0};
- sid.cbSize = sizeof(SKINICONDESC);
- sid.flags = SIDF_ALL_TCHAR;
+ SKINICONDESC sid = { sizeof(sid) };
+ sid.flags = SIDF_PATH_TCHAR;
sid.ptszDefaultFile = szFile;
- sid.ptszSection = _T("YAMN");
+ sid.pszSection = "YAMN";
- for (int i = 0, k = 0; i < SIZEOF(iconList); i++)
- {
+ for (int i = 0, k = 0; i < SIZEOF(iconList); i++) {
sid.pszName = iconList[i].szName;
- sid.ptszDescription = iconList[i].szDescr;
+ sid.pszDescription = iconList[i].szDescr;
sid.iDefaultIndex = -iconList[i].defIconID;
iconList[i].hIcon = Skin_AddIcon(&sid);
}