--- rxvt-unicode/src/defaultfont.h	2004/02/13 12:16:21	1.11
+++ rxvt-unicode/src/defaultfont.h	2004/02/22 08:28:36	1.13
@@ -49,7 +49,7 @@
   }
 
   rxvt_font () { name = 0; }
-  ~rxvt_font () { clear (); free (name); };
+  ~rxvt_font () { free (name); };
 
   void clear_rect (int x, int y, int w, int h, int color);
 
@@ -65,9 +65,7 @@
                      int fg, int bg) = 0;
 };
 
-//#define FONT_REF(obj) (obj)->refcnt++
-//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
-#define FONT_UNREF(f) delete f
+#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
 
 struct rxvt_fallback_font;
 
@@ -77,7 +75,7 @@
 
   rxvt_font *new_font (const char *name, codeset cs);
 
-  void populate (const char *desc);
+  bool populate (const char *desc);
   int find_font (uint32_t unicode);
 
   rxvt_font *operator [] (int id) const