Mercurial > pidgin
comparison gtk/plugins/docklet/docklet-win32.c @ 14360:c196a30f645f
[gaim-migrate @ 17066]
Kevin pointed out that this wasn't allowing Windows 6.0 (only 6.1)
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 27 Aug 2006 22:51:40 +0000 |
parents | 114e692e08fb |
children |
comparison
equal
deleted
inserted
replaced
14359:114e692e08fb | 14360:c196a30f645f |
---|---|
210 /* Load icons, and init systray notify icon | 210 /* Load icons, and init systray notify icon |
211 * NOTE: Windows < XP only supports displaying 4-bit images in the Systray, | 211 * NOTE: Windows < XP only supports displaying 4-bit images in the Systray, |
212 * 2K and ME will use the highest color depth that the desktop will support, | 212 * 2K and ME will use the highest color depth that the desktop will support, |
213 * but will scale it back to 4-bits for display. | 213 * but will scale it back to 4-bits for display. |
214 * That is why we use custom 4-bit icons for pre XP Windowses */ | 214 * That is why we use custom 4-bit icons for pre XP Windowses */ |
215 if (osinfo.dwMajorVersion >= 5 && osinfo.dwMinorVersion > 0) { | 215 if ((osinfo.dwMajorVersion == 5 && osinfo.dwMinorVersion > 0) || |
216 (osinfo.dwMajorVersion >= 6)) | |
217 { | |
216 sysicon_disconn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0); | 218 sysicon_disconn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0); |
217 sysicon_conn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0); | 219 sysicon_conn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0); |
218 sysicon_away = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0); | 220 sysicon_away = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0); |
219 sysicon_pend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); | 221 sysicon_pend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); |
220 sysicon_awypend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); | 222 sysicon_awypend = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0); |