misc doc

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@563 7f574dfc-610e-0410-a909-a81674777703

diff --git a/ChangeLog b/ChangeLog
index f06f6b4..a47037c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
        * Fixed battery problems when charged
        * MPD code handles broken pipe now, instead of just killing conky
        * Switch from CVS to SVN.  Thanks SourceForge.
+       * Fixed issue where some WM's don't control conky own_window windows.
+       * Added newly-updated vim file detection and syntax hilighting files to svn.
 
 2006-03-05
        * Added patch to make $cpu stuff work on alpha (thanks Thomas Cort)

diff --git a/src/x11.c b/src/x11.c
index 090ccb1..fd185fb 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -203,8 +203,8 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour, c
                        /* Allow WM control of conky again.  Shielding conky from the WM 
                         * via override redirect creates more problems than it's worth and
                         * makes it impossible to use tools like devilspie to manage the
-                        * conky windows beyond the parametsrs we offer.  Also, button 
-                        * press events are now explicitly forwarded to the root window. */
+                        * conky windows beyond the parameters we offer.  ButtonPress 
+                        * events are now explicitly forwarded to the desktop window. */
                        XSetWindowAttributes attrs = {
                                ParentRelative,0L,0,0L,0,0,Always,0L,0L,False,
                                StructureNotifyMask|ExposureMask|ButtonPressMask,