--- rxvt-unicode/src/main.C	2004/12/09 06:20:41	1.118
+++ rxvt-unicode/src/main.C	2004/12/20 16:44:31	1.123
@@ -34,7 +34,7 @@
 #include "rxvt.h"               /* NECESSARY */
 #include "main.intpro"          /* PROTOS for internal routines */
 
-#include <signal.h>
+#include <csignal>
 
 #ifdef TTY_GID_SUPPORT
 # include <grp.h>
@@ -261,9 +261,8 @@
   free (env_term);
   free (env_colorfgbg);
   free (locale);
-#if 0
-  free (codeset);
-#endif
+  free (v_buffer);
+  free (incr_buf);
 
   delete envv;
   delete argv;
@@ -863,7 +862,7 @@
 {
   set_string_property (XA_WM_NAME, str);
 #if ENABLE_FRILLS
-  set_utf8_property (display->atom ("_NET_WM_NAME"), str);
+  set_utf8_property (xa[XA_NET_WM_NAME], str);
 #endif
 }
 
@@ -872,7 +871,7 @@
 {
   set_string_property (XA_WM_ICON_NAME, str);
 #if ENABLE_FRILLS
-  set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str);
+  set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
 #endif
 }
 
@@ -1001,10 +1000,6 @@
 }
 
 /*----------------------------------------------------------------------*/
-/*
- * Colour determination for low colour displays, routine from
- *     Hans de Goede <hans@highrise.nl>
- */
 
 int
 rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)