diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-05 18:46:19 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-05 18:46:19 +0000 |
| commit | 622d5101fe221d6839c859e0a643259f2cc474c9 (patch) | |
| tree | 8f02bb435d8a9daf7f4732c52eb3738d4f2c044a /plugins/Clist_modern/src | |
| parent | 9a0205dafcb78816771e5c4bbaefddd1e87772a1 (diff) | |
- GetAverageMode moved to CLIST_INTERFACE;
- copy of it removed from clist_modern
git-svn-id: http://svn.miranda-ng.org/main/trunk@6793 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src')
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_commonprototypes.h | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clisttray.cpp | 24 |
2 files changed, 1 insertions, 24 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index b1da2a00d2..785c9a7160 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -216,7 +216,6 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szStatus, int BgStatusBarChange(WPARAM wParam,LPARAM lParam); //clcopts.c
int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack); //clc.c
int ModernSkinButtonDeleteAll(); //modernbutton.c
-int GetAverageMode( void ); //clisttray.c
int GetContactCachedStatus(HANDLE hContact); //clistsettings.c
int GetContactIconC(ClcCacheEntry *cacheEntry); //clistmod.c
int GetContactIndex(ClcGroup *group,ClcContact *contact); //clcidents.c
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 203a9b25d8..d6397ecd1f 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -120,28 +120,6 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM wparam,LPARAM lparam) return curstatus?curstatus:ID_STATUS_OFFLINE;
}
-int GetAverageMode()
-{
- int count,netProtoCount,i;
- int averageMode = 0;
- PROTOACCOUNT **accs;
- ProtoEnumAccounts( &count, &accs );
- for (i=0, netProtoCount = 0;i < count;i++) {
- if ( pcli->pfnGetProtocolVisibility(accs[i]->szModuleName) == 0)
- continue;
-
- pcli->cycleStep = i;
- netProtoCount++;
- if (averageMode == 0)
- averageMode = CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0);
- else if (averageMode != CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0)) {
- averageMode = -1;
- break;
- }
- }
- return averageMode;
-}
-
////////////////////////////////////////////////////////////
///// Need to refresh trays icon after timely changing/////
////////////////////////////////////////////////////////////
@@ -257,7 +235,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProto return pcli->pfnTrayIconSetBaseInfo(hIcon,szChangedProto);
}
else if (pcli->pfnGetProtocolVisibility(szChangedProto)) {
- int avg = GetAverageMode();
+ int avg = pcli->pfnGetAverageMode(NULL);
int i = pcli->pfnTrayIconSetBaseInfo(cliGetIconFromStatusMode(NULL,szChangedProto,CallProtoService(szChangedProto,PS_GETSTATUS, 0, 0)),szChangedProto);
if (i < 0) {
pcli->pfnTrayIconDestroy(hwnd);
|