X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32taskbar.c;h=0b9ebba7d73c78890cb42dad05ec754e62da7929;hp=7bf83d942ad93a2910770ceb6e63f084543e05a8;hb=d2fcc92169b6847df5c86c22f0542e3f5bf97d8d;hpb=51372679fa2205631ee27c6ac621449bcdd083c3 diff --git a/w32taskbar.c b/w32taskbar.c index 7bf83d94..0b9ebba7 100644 --- a/w32taskbar.c +++ b/w32taskbar.c @@ -1,4 +1,4 @@ -const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.4 2001/11/16 00:46:31 jongfoster Exp $"; +const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.9 2006/07/18 14:48:48 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $ @@ -7,7 +7,7 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.4 2001/11/16 00:46:31 jongf * workspace tray icon * * Copyright : Written by and Copyright (C) 2001-2002 members of - * the Privoxy team. http://privoxy.org/ + * the Privoxy team. http://www.privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -32,6 +32,26 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.4 2001/11/16 00:46:31 jongf * * Revisions : * $Log: w32taskbar.c,v $ + * Revision 1.9 2006/07/18 14:48:48 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * 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 * @@ -52,6 +72,9 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.4 2001/11/16 00:46:31 jongf #include +#ifndef STRICT +#define STRICT +#endif #include #include "w32taskbar.h" @@ -66,6 +89,7 @@ const char w32taskbar_h_rcs[] = W32TASKBAR_H_VERSION; static HMENU g_hmenuTray; static HWND g_hwndTrayX; +static UINT g_traycreatedmsg; static LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -101,6 +125,9 @@ 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_hwndTrayX = CreateWindow(szWndName, szWndName, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL ); @@ -261,7 +288,11 @@ LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return 0; default: - /* DO NOTHING */ + + if (msg == g_traycreatedmsg) + { + TrayAddIcon(g_hwndTrayX, 1, g_hiconApp, "Privoxy"); + } break; }