X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32taskbar.c;h=0a25bbd8a27d2420f81e613c0c9dbce88fa26011;hp=bc35db8a5629d101d08af0c7df2363a840c6c50c;hb=23445442f4bf0aa0bcf6e35df09daf8ef0d69d99;hpb=72081f829de368392d04076728f8c991178c0080

diff --git a/w32taskbar.c b/w32taskbar.c
index bc35db8a..0a25bbd8 100644
--- a/w32taskbar.c
+++ b/w32taskbar.c
@@ -1,18 +1,17 @@
-const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 gliptak Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/Attic/w32taskbar.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $
  *
  * Purpose     :  Functions for creating, setting and destroying the
  *                workspace tray icon
  *
  * Copyright   :  Written by and Copyright (C) 2001-2002 members of
- *                the Privoxy team.  http://www.privoxy.org/
+ *                the Privoxy team.  https://www.privoxy.org/
  *
  *                Written by and Copyright (C) 1999 Adam Lock
  *                <locka@iol.ie>
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -30,39 +29,8 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 g
  *                or write to the Free Software Foundation, Inc., 59
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Revisions   :
- *    $Log: w32taskbar.c,v $
- *    Revision 1.7.2.2  2003/03/19 21:27:42  gliptak
- *    Corrected compilation error/typo
- *
- *    Revision 1.7.2.1  2002/11/20 14:39:32  oes
- *    Applied patch by Mattes Dolak which adds re-creation of the win32 taskbar
- *    icon on reception of the "TaskbarCreated" window message.
- *
- *    Revision 1.7  2002/03/31 17:19:00  jongfoster
- *    Win32 only: Enabling STRICT to fix a VC++ compile warning.
- *
- *    Revision 1.6  2002/03/26 22:57:10  jongfoster
- *    Web server name should begin www.
- *
- *    Revision 1.5  2002/03/24 12:03:47  jongfoster
- *    Name change
- *
- *    Revision 1.4  2001/11/16 00:46:31  jongfoster
- *    Fixing compiler warnings
- *
- *    Revision 1.3  2001/05/22 18:56:28  oes
- *    CRLF -> LF
- *
- *    Revision 1.2  2001/05/20 15:07:54  jongfoster
- *    File is now ignored if _WIN_CONSOLE is defined.
- *
- *    Revision 1.1.1.1  2001/05/15 13:59:08  oes
- *    Initial import of version 2.9.3 source tree
- *
- *
  *********************************************************************/
-
+
 
 #include "config.h"
 
@@ -77,8 +45,6 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 g
 #include "w32res.h"
 #include "w32log.h"
 
-const char w32taskbar_h_rcs[] = W32TASKBAR_H_VERSION;
-
 #ifndef _WIN_CONSOLE /* entire file */
 
 #define WM_TRAYMSG WM_USER+1
@@ -122,11 +88,11 @@ HWND CreateTrayWindow(HINSTANCE hInstance)
    RegisterClass(&wc);
 
    /* TaskbarCreated is sent to a window when it should re-add its tray icons */
-   g_traycreatedmsg = RegisterWindowMessage("TaskbarCreated");	
+   g_traycreatedmsg = RegisterWindowMessage("TaskbarCreated");
 
    g_hwndTrayX = CreateWindow(szWndName, szWndName,
       WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-      CW_USEDEFAULT, NULL, NULL, hInstance, NULL );
+      CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
 
    ShowWindow(g_hwndTrayX, SW_HIDE);
    UpdateWindow(g_hwndTrayX);
@@ -165,7 +131,7 @@ BOOL TraySetIcon(HWND hwnd, UINT uID, HICON hicon)
    nid.uCallbackMessage = 0;
    nid.hIcon = hicon;
 
-   return( Shell_NotifyIcon(NIM_MODIFY, &nid) );
+   return(Shell_NotifyIcon(NIM_MODIFY, &nid));
 
 }
 
@@ -203,7 +169,7 @@ BOOL TrayAddIcon(HWND hwnd, UINT uID, HICON hicon, const char *pszToolTip)
       strcpy(nid.szTip, pszToolTip);
    }
 
-   return( Shell_NotifyIcon(NIM_ADD, &nid) );
+   return(Shell_NotifyIcon(NIM_ADD, &nid));
 
 }
 
@@ -231,7 +197,7 @@ BOOL TrayDeleteIcon(HWND hwnd, UINT uID)
    nid.hWnd = hwnd;
    nid.uID = uID;
 
-   return( Shell_NotifyIcon(NIM_DELETE, &nid) );
+   return(Shell_NotifyIcon(NIM_DELETE, &nid));
 
 }
 
@@ -274,7 +240,7 @@ LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             GetCursorPos(&pt);
             SetForegroundWindow(g_hwndLogFrame);
             TrackPopupMenu(hmenu, TPM_LEFTALIGN | TPM_TOPALIGN, pt.x, pt.y, 0, g_hwndLogFrame, NULL);
-            PostMessage(g_hwndLogFrame, WM_NULL, 0, 0 ) ;
+            PostMessage(g_hwndLogFrame, WM_NULL, 0, 0);
          }
          else if (uMouseMsg == WM_LBUTTONDBLCLK)
          {