Mercurial > pidgin.yaz
changeset 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 | 0c3957362c69 |
| files | gtk/plugins/docklet/docklet-win32.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk/plugins/docklet/docklet-win32.c Sun Aug 27 22:47:32 2006 +0000 +++ b/gtk/plugins/docklet/docklet-win32.c Sun Aug 27 22:51:40 2006 +0000 @@ -212,7 +212,9 @@ * 2K and ME will use the highest color depth that the desktop will support, * but will scale it back to 4-bits for display. * That is why we use custom 4-bit icons for pre XP Windowses */ - if (osinfo.dwMajorVersion >= 5 && osinfo.dwMinorVersion > 0) { + if ((osinfo.dwMajorVersion == 5 && osinfo.dwMinorVersion > 0) || + (osinfo.dwMajorVersion >= 6)) + { sysicon_disconn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0); sysicon_conn = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0); sysicon_away = (HICON)LoadImage(gtkwgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0);