diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-23 16:53:39 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-23 16:53:39 +0000 |
| commit | 32585af370c0bb4edf03b6b9af90eedad0a40096 (patch) | |
| tree | 8a7bde213ccd2ec733dd0023c711f635d8df2709 /src | |
| parent | c6b5672f802accd3ca3d27eb9ab050c7b0923eb2 (diff) | |
attempt to replace metaicons in tabSRMM with the active protocol icons
git-svn-id: http://svn.miranda-ng.org/main/trunk@8709 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/metacontacts/meta_services.cpp | 1 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_utils.cpp | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp index 89d2c309d2..4a283466e9 100644 --- a/src/modules/metacontacts/meta_services.cpp +++ b/src/modules/metacontacts/meta_services.cpp @@ -635,6 +635,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) // create srmm icon
StatusIconData sid = { sizeof(sid) };
sid.szModule = META_PROTO;
+ sid.hIcon = LoadSkinnedProtoIcon(META_PROTO, ID_STATUS_ONLINE);
Srmm_AddIcon(&sid);
// hook srmm window close/open events
diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/modules/metacontacts/meta_utils.cpp index 9adcaa451d..611ba1e0cd 100644 --- a/src/modules/metacontacts/meta_utils.cpp +++ b/src/modules/metacontacts/meta_utils.cpp @@ -540,19 +540,6 @@ void Meta_UpdateSrmmIcon(DBCachedContact *ccMeta, int iStatus) {
StatusIconData sid = { sizeof(sid) };
sid.szModule = META_PROTO;
- sid.flags = MBF_HIDDEN;
- if (ccMeta->IsMeta()) {
- MCONTACT hSub = Meta_GetMostOnline(ccMeta);
- char *szProto = GetContactProto(hSub);
- if (szProto) {
- sid.hIcon = LoadSkinnedProtoIcon(szProto, iStatus);
-
- PROTOACCOUNT *pa = Proto_GetAccount(szProto);
- if (pa) {
- sid.flags = MBF_TCHAR;
- sid.tszTooltip = pa->tszAccountName;
- }
- }
- }
+ sid.flags = (ccMeta->IsMeta()) ? 0 : MBF_HIDDEN;
Srmm_ModifyIcon(ccMeta->contactID, &sid);
}
|