diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-12-01 13:25:11 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-12-01 13:25:11 +0000 |
| commit | 854959cbc0a1bad2c086214be4d1a829b17a61f3 (patch) | |
| tree | ee3de50f4b4e57f54ae20d139f97fa469ff90d34 /protocols/JabberG | |
| parent | 73ddc73d92675399e4619758d4b0881418de0a6d (diff) | |
icolib: icon creation quirks
git-svn-id: http://svn.miranda-ng.org/main/trunk@2588 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_icolib.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index 2df794d300..3abf457b1b 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -347,7 +347,6 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa {
char szPath[MAX_PATH],szMyPath[MAX_PATH], szFullPath[MAX_PATH],*str;
BOOL has_proto_icon=FALSE;
- SKINICONDESC sid={0};
if (needFree) *needFree=FALSE;
GetModuleFileNameA(NULL, szPath, MAX_PATH);
str=strrchr(szPath,'\\');
@@ -359,8 +358,8 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa if (hi) has_proto_icon=TRUE;
if (hi && nf) DestroyIcon(hi);
if (IconName != NULL && SectName != NULL) {
- sid.cbSize = sizeof(sid);
- sid.hDefaultIcon = (has_proto_icon)?NULL:(HICON)CallService(MS_SKIN_LOADPROTOICON,0,(LPARAM)(-internalidx));
+ SKINICONDESC sid = { sizeof(sid) };
+ sid.hDefaultIcon = (has_proto_icon) ? NULL : LoadSkinnedProtoIcon(0, -internalidx);
sid.ptszSection = SectName;
sid.pszName = IconName;
sid.ptszDescription = Description;
@@ -384,7 +383,6 @@ static HICON LoadSmallIcon(HINSTANCE hInstance, LPCTSTR lpIconName) int CJabberProto::LoadAdvancedIcons(int iID)
{
- int i;
char *proto = TransportProtoTable[iID].proto;
char defFile[MAX_PATH] = {0};
TCHAR Group[255];
@@ -398,7 +396,7 @@ int CJabberProto::LoadAdvancedIcons(int iID) hAdvancedStatusIcon=(HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST,0,0);
EnterCriticalSection(&m_csModeMsgMutex);
- for (i=0; i<ID_STATUS_ONTHEPHONE-ID_STATUS_OFFLINE; i++) {
+ for (int i=0; i < ID_STATUS_ONTHEPHONE-ID_STATUS_OFFLINE; i++) {
HICON hicon;
BOOL needFree;
int n=skinStatusToJabberStatus[i];
|