small fixes

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

diff --git a/ChangeLog b/ChangeLog
index ea191ea..336069b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # $Id$
 
+2005-09-11
+       * Fixed bug with xft and double buffer in own window
+       * 1.3.1 released
+
 2005-09-04
        * Misc small bug fixes
 
@@ -9,6 +13,7 @@
 
 2005-08-31
        * FreeBSD support was added
+       * 1.3.0 released
 
 2005-08-27
        * added threaded execi, $texeci

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ea381ed..844eeaa 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,9 @@ conky.1: command_options.xml config_settings.xml docs.xml variables.xml
        xsltproc ${srcdir}/variables.xsl ${srcdir}/variables.xml > variables.html
        xsltproc ${srcdir}/config_settings.xsl ${srcdir}/config_settings.xml > config_settings.html
 
+else
+conky.1:
+
 endif
 
 man_MANS = conky.1

diff --git a/src/conky.c b/src/conky.c
index dcbc46a..0c15121 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -3847,8 +3847,9 @@ static void clear_text(int exposures)
 #ifdef XDBE
        if (use_xdbe) {
                return;         /* The swap action is XdbeBackground, which clears */
-       }
+       } else
 #endif
+       {
        /* there is some extra space for borders and outlines */
        XClearArea(display, window.drawable,
                   text_start_x - border_margin - 1,
@@ -3856,6 +3857,7 @@ static void clear_text(int exposures)
                   text_width + border_margin * 2 + 2,
                   text_height + border_margin * 2 + 2,
                   exposures ? True : 0);
+       }
 }
 #endif /* X11 */
 
@@ -4057,6 +4059,7 @@ static void main_loop()
                                                || ev.xconfigure.y != 0)) {
                                                fixed_pos = 1;
                                }*/
+                                       set_font();
                                }
                                break;
 #endif

diff --git a/src/x11.c b/src/x11.c
index f26eb6c..d050818 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -166,7 +166,7 @@ inline void set_transparent_background(Window win)
        } else if (colour_set != background_colour) {
                XSetWindowBackground(display, win, background_colour);
                colour_set = background_colour;
-       }
+}
        //XClearWindow(display, win); not sure why this was here
 }