[Gaim-commits] SF.net SVN: gaim: [17066] trunk/gtk/plugins/docklet/docklet-win32.c

[<the...@us...>]

Revision: 17066
Author:   thekingant
Date:     2006-08-27 15:51:40 -0700 (Sun, 27 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17066&view=rev

Log Message:
-----------
Kevin pointed out that this wasn't allowing Windows 6.0 (only 6.1)

Modified Paths:
--------------
    trunk/gtk/plugins/docklet/docklet-win32.c
Modified: trunk/gtk/plugins/docklet/docklet-win32.c
===================================================================
--- trunk/gtk/plugins/docklet/docklet-win32.c	2006-08-27 22:47:32 UTC (rev 17065)
+++ trunk/gtk/plugins/docklet/docklet-win32.c	2006-08-27 22:51:40 UTC (rev 17066)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.