X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ffonts.c;h=6067bf2327ba1a5d0f07c5c39c398e980bab9cfa;hb=085c39d39464642746a1883266d9dffcfc10e84c;hp=b110d1099e49dad21a2331bc405a2be489bd5901;hpb=09c0bccf55cd42fc27ffb234bda7c65b04e3dd60;p=monky

diff --git a/src/fonts.c b/src/fonts.c
index b110d10..6067bf2 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -58,7 +58,7 @@ void setup_fonts(void)
 			window.xftdraw = 0;
 		}
 		window.xftdraw = XftDrawCreate(display, window.drawable,
-				DefaultVisual(display, screen), DefaultColormap(display, screen));
+				window.visual, window.colourmap);
 	}
 #endif /* XFT */
 	set_font();
@@ -135,7 +135,13 @@ void free_fonts(void)
 	for (i = 0; i <= font_count; i++) {
 #ifdef XFT
 		if (use_xft) {
-			XftFontClose(display, fonts[i].xftfont);
+			/*
+			 * Do we not need to close fonts with Xft? Unsure.  Not freeing the
+			 * fonts seems to incur a slight memory leak, but it also prevents
+			 * a crash.
+			 *
+			 * XftFontClose(display, fonts[i].xftfont);
+			 */
 			fonts[i].xftfont = 0;
 		} else
 #endif /* XFT */