projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge Debian changes from 3.0.10 to 3.0.12.
[privoxy.git]
/
w32taskbar.c
diff --git
a/w32taskbar.c
b/w32taskbar.c
index
bc35db8
..
0b9ebba
100644
(file)
--- a/
w32taskbar.c
+++ b/
w32taskbar.c
@@
-1,7
+1,7
@@
-const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.
7.2.2 2003/03/19 21:27:42 gliptak
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/
Attic/
w32taskbar.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $
*
* Purpose : Functions for creating, setting and destroying the
* workspace tray icon
*
* Purpose : Functions for creating, setting and destroying the
* workspace tray icon
@@
-32,6
+32,10
@@
const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 g
*
* Revisions :
* $Log: w32taskbar.c,v $
*
* 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.2 2003/03/19 21:27:42 gliptak
* Corrected compilation error/typo
*
@@
-122,7
+126,7
@@
HWND CreateTrayWindow(HINSTANCE hInstance)
RegisterClass(&wc);
/* TaskbarCreated is sent to a window when it should re-add its tray icons */
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,
g_hwndTrayX = CreateWindow(szWndName, szWndName,
WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,