diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-18 21:16:39 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-18 21:16:39 +0000 |
| commit | 0a749321d05905e3d6396b053cbe8b208e7e4aa6 (patch) | |
| tree | 69714092cf8ebe892bf79c56f1641ecfa701cfb5 /protocols/JabberG/src/jabber_icolib.cpp | |
| parent | e74376e044f745e7efdbb6bcd3d8c1de5d46d470 (diff) | |
minor code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@5029 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_icolib.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_icolib.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index 698276b8a5..ed7f03efab 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -324,15 +324,14 @@ int CJabberProto::LoadAdvancedIcons(int iID) EnterCriticalSection(&m_csModeMsgMutex);
for (int i=0; i < ID_STATUS_ONTHEPHONE-ID_STATUS_OFFLINE; i++) {
- HICON hicon;
BOOL needFree;
- int n=skinStatusToJabberStatus[i];
- TCHAR *descr = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, n+ID_STATUS_OFFLINE, GSMDF_TCHAR);
+ int n = skinStatusToJabberStatus[i];
+ TCHAR *descr = pcli->pfnGetStatusModeDescription(n+ID_STATUS_OFFLINE, 0);
mir_snprintf(Uname, SIZEOF(Uname), "%s_Transport_%s_%d", m_szModuleName, proto, n);
- hicon=(HICON)LoadTransportIcon(defFile,-skinIconStatusToResourceId[i],Uname,Group,descr,-(n+ID_STATUS_OFFLINE),&needFree);
- int index=(m_transportProtoTableStartIndex[iID] == -1)?-1:m_transportProtoTableStartIndex[iID]+n;
- int added=ImageList_ReplaceIcon(hAdvancedStatusIcon,index,hicon?hicon:empty);
- if (first == -1) first=added;
+ HICON hicon = LoadTransportIcon(defFile,-skinIconStatusToResourceId[i],Uname,Group,descr,-(n+ID_STATUS_OFFLINE),&needFree);
+ int index = (m_transportProtoTableStartIndex[iID] == -1)?-1:m_transportProtoTableStartIndex[iID]+n;
+ int added = ImageList_ReplaceIcon(hAdvancedStatusIcon,index,hicon?hicon:empty);
+ if (first == -1) first = added;
if (hicon && needFree) DestroyIcon(hicon);
}
|