Fixed a regression with font rendering.

Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.

diff --git a/ChangeLog b/ChangeLog
index d3b2322..e7ca6fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2009-06-09
+       * Fixed a regression which causes fonts to not be rendered properly with
+       certain types of windows
        * Added format_human_readable option (sf.net #2803345, thanks Vincent)
        * Fix bug in comments within TEXT (where the line contains just '#')
        (sf.net #2803586), thanks Pavelo

diff --git a/src/conky.c b/src/conky.c
index 1f61616..f498ae5 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -6653,6 +6653,7 @@ static void draw_text(void)
                /* draw text */
                special_index = 0;
        }
+       setup_fonts();
 #endif /* X11 */
        for_each_line(text_buffer, draw_line);
 }

diff --git a/src/fonts.c b/src/fonts.c
index 6262402..67e363a 100644 (file)
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -38,7 +38,10 @@ void setup_fonts(void)
                return;
        }
 #ifdef XFT
-       if (use_xft && !window.xftdraw) {
+       if (use_xft) {
+               if (window.xftdraw) {
+                       XftDrawDestroy(window.xftdraw);
+               }
                window.xftdraw = XftDrawCreate(display, window.drawable,
                                DefaultVisual(display, screen), DefaultColormap(display, screen));
        }

diff --git a/src/x11.c b/src/x11.c
index bd9b32b..d66955d 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -230,7 +230,6 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
 
 #ifdef OWN_WINDOW
        if (own_window) {
-
                if (!find_desktop_window(&window.root, &window.desktop)) {
                        return;
                }