diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-01 17:50:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-01 17:50:51 +0000 |
| commit | c476c108afcabeef34c40b7d33ffbb62d68ca24f (patch) | |
| tree | d20e8fa4bb33ec6521f2300d1056704713088d7f | |
| parent | a845dea07ad128d2b71d731c00c8a5acc3eff0cf (diff) | |
fix for displaying tray icons
git-svn-id: http://svn.miranda-ng.org/main/trunk@6737 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | src/modules/clist/clisttray.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp index ba7d92857b..10f51c3538 100644 --- a/src/modules/clist/clisttray.cpp +++ b/src/modules/clist/clisttray.cpp @@ -184,7 +184,7 @@ int fnTrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int s NOTIFYICONDATA nid = { SIZEOFNID };
nid.hWnd = hwnd;
nid.uID = cli.trayIcon[i].id;
- nid.uFlags = NIF_ICON | NIF_MESSAGE | (mToolTipTrayTips ? 0 : NIF_TIP);
+ nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
nid.uCallbackMessage = TIM_CALLBACK;
nid.hIcon = cli.trayIcon[i].hBaseIcon;
@@ -337,7 +337,7 @@ int fnTrayIconUpdate(HICON hNewIcon, const TCHAR *szNewTip, const char *szPrefer NOTIFYICONDATA nid = { SIZEOFNID };
nid.hWnd = cli.hwndContactList;
- nid.uFlags = NIF_ICON | (mToolTipTrayTips ? 0 : NIF_TIP);
+ nid.uFlags = NIF_ICON | NIF_TIP;
nid.hIcon = hNewIcon;
if ( !hNewIcon)
return -1;
@@ -799,8 +799,6 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam) int fnCListTrayNotify(MIRANDASYSTRAYNOTIFY* msn)
{
- UINT iconId = 0;
-
if (msn == NULL)
return 1;
@@ -810,9 +808,9 @@ int fnCListTrayNotify(MIRANDASYSTRAYNOTIFY* msn) if (cli.trayIcon == NULL)
return 2;
+ UINT iconId = 0;
if (msn->szProto) {
- int j;
- for (j = 0; j < cli.trayIconCount; j++) {
+ for (int j = 0; j < cli.trayIconCount; j++) {
if (cli.trayIcon[j].szProto != NULL) {
if ( !strcmp(msn->szProto, cli.trayIcon[j].szProto)) {
iconId = cli.trayIcon[j].id;
|