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 /src/modules/clist/clisttray.cpp | |
| 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 'src/modules/clist/clisttray.cpp')
| -rw-r--r-- | src/modules/clist/clisttray.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp index 10f51c3538..f1ee4a3bad 100644 --- a/src/modules/clist/clisttray.cpp +++ b/src/modules/clist/clisttray.cpp @@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HIMAGELIST hCListImages;
-int GetAverageMode(int* pNetProtoCount = NULL);
-
static UINT WM_TASKBARCREATED;
static UINT WM_TASKBARBUTTONCREATED;
static BOOL mToolTipTrayTips = FALSE;
@@ -235,7 +233,7 @@ int fnTrayIconInit(HWND hwnd) mir_cslock lck(trayLockCS);
int netProtoCount = 0;
- int averageMode = GetAverageMode(&netProtoCount);
+ int averageMode = cli.pfnGetAverageMode(&netProtoCount);
mToolTipTrayTips = ServiceExists("mToolTip/ShowTip") != 0;
if (cli.cycleTimerId) {
@@ -420,7 +418,7 @@ LBL_Error: return i;
}
if ((cli.pfnGetProtocolVisibility(szPreferredProto)) &&
- (GetAverageMode() == -1) &&
+ (cli.pfnGetAverageMode(NULL) == -1) &&
(db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI) &&
!(db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT)))
goto LBL_Error;
@@ -475,7 +473,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto) int netProtoCount;
mir_cslock lck(trayLockCS);
- int averageMode = GetAverageMode(&netProtoCount);
+ int averageMode = cli.pfnGetAverageMode(&netProtoCount);
if (cli.cycleTimerId) {
KillTimer(NULL, cli.cycleTimerId);
|