# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1156719100 0
# Node ID c196a30f645f81f3dca14ef3b60607b45ea1785b
# Parent  114e692e08fb30369db76a3ea2204d5c00a373a2
[gaim-migrate @ 17066]
Kevin pointed out that this wasn't allowing Windows 6.0 (only 6.1)

committer: Tailor Script <tailor@pidgin.im>

diff -r 114e692e08fb -r c196a30f645f gtk/plugins/docklet/docklet-win32.c
--- 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);