diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-19 22:48:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-19 22:48:01 +0000 |
| commit | 95aa036670a1ce2c461ffd9bd3a586d191ee4675 (patch) | |
| tree | cd244db18622df3462166ed39593ca924c890f6b /protocols/JabberG/jabber_icolib.cpp | |
| parent | f6e0db0590e2f8feeacc29d4e50007fbe358f9d5 (diff) | |
- various icolib fixes;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@1061 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_icolib.cpp')
| -rw-r--r-- | protocols/JabberG/jabber_icolib.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/protocols/JabberG/jabber_icolib.cpp b/protocols/JabberG/jabber_icolib.cpp index 029a4be6c9..04609604f4 100644 --- a/protocols/JabberG/jabber_icolib.cpp +++ b/protocols/JabberG/jabber_icolib.cpp @@ -283,9 +283,7 @@ void CJabberProto::IconsInit( void ) mir_sntprintf( tmp, SIZEOF(tmp), _T(TCHAR_STR_PARAM), iconList[i].szDescr );
mir_sntprintf( szDescription, SIZEOF(szDescription), tmp, m_tszUserName );
}
- else {
- mir_sntprintf( szDescription, SIZEOF(szDescription), _T(TCHAR_STR_PARAM), iconList[i].szDescr );
- }
+ else mir_sntprintf( szDescription, SIZEOF(szDescription), _T(TCHAR_STR_PARAM), iconList[i].szDescr );
mir_snprintf( szSettingName, SIZEOF(szSettingName), "%s_%s", m_szModuleName, iconList[i].szName );
@@ -412,10 +410,10 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa sid.cbSize = sizeof(sid);
sid.hDefaultIcon = (has_proto_icon)?NULL:(HICON)CallService(MS_SKIN_LOADPROTOICON,(WPARAM)NULL,(LPARAM)(-internalidx));
sid.ptszSection = SectName;
- sid.pszName=IconName;
- sid.ptszDescription=Description;
- sid.pszDefaultFile=szMyPath;
- sid.iDefaultIndex=i;
+ sid.pszName = IconName;
+ sid.ptszDescription = Description;
+ sid.pszDefaultFile = szMyPath;
+ sid.iDefaultIndex = i;
sid.flags = SIDF_TCHAR;
Skin_AddIcon(&sid);
}
@@ -661,12 +659,13 @@ static TIconListItem sharedIconList[] = static void sttProcessIcons( int iAmount )
{
- char szFile[MAX_PATH];
- GetModuleFileNameA(hInst, szFile, MAX_PATH);
+ TCHAR szFile[MAX_PATH];
+ GetModuleFileName(hInst, szFile, MAX_PATH);
SKINICONDESC sid = {0};
sid.cbSize = sizeof(SKINICONDESC);
- sid.pszDefaultFile = szFile;
+ sid.ptszDefaultFile = szFile;
+ sid.flags = SIDF_PATH_TCHAR;
char szRootSection[100];
mir_snprintf( szRootSection, SIZEOF(szRootSection), "%s/%s", LPGEN("Protocols"), LPGEN("Jabber"));
|