Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 70150 invoked by uid 500); 8 Aug 2001 02:27:50 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 70138 invoked by uid 500); 8 Aug 2001 02:27:50 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 8 Aug 2001 02:26:05 -0000 Message-ID: <20010808022605.33993.qmail@icarus.apache.org> From: fielding@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/support/win32 ApacheMonitor.c X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N Status: O X-Status: X-Keywords: X-UID: 115 fielding 01/08/07 19:26:05 Modified: support/win32 ApacheMonitor.c Log: Apache Monitor's tray code does not notify Windows to remove it from the tray when the process is destroyed. Just needed to add a call to remove the tray icon before PostQuitMessage(0). Also show "MS Windows XP" instead of "Whistler". Submitted by: Jerry Baker Revision Changes Path 1.3 +2 -1 httpd-2.0/support/win32/ApacheMonitor.c Index: ApacheMonitor.c =================================================================== RCS file: /home/cvs/httpd-2.0/support/win32/ApacheMonitor.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ApacheMonitor.c 2001/08/07 19:54:10 1.2 +++ ApacheMonitor.c 2001/08/08 02:26:05 1.3 @@ -212,7 +212,7 @@ else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) strcpy(szVersion, "MS Windows 2000 "); else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) - strcpy(szVersion, "Whistler "); + strcpy(szVersion, "MS Windows XP "); /* Test for product type.*/ #ifdef VER_VORKSTATION_NT if (bOsVersionInfoEx) @@ -1440,6 +1440,7 @@ SetFocus(ap_hwndAboutDlg); break; case IDM_EXIT: + ShowNotifyIcon(hWnd, NIM_DELETE); PostQuitMessage(0); return TRUE; break;