--- rxvt-unicode/src/menubar.C	2004/02/24 16:25:44	1.10
+++ rxvt-unicode/src/menubar.C	2004/04/08 20:31:45	1.16
@@ -1,8 +1,9 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	menubar.c
+ * File:	menubar.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998  mj olesen <olesen@me.QueensU.CA>
+ * Copyright (c) 2004       Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +25,7 @@
 
 #include "../config.h"		/* NECESSARY */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "rxvt.h"		/* NECESSARY */
 #ifdef MENUBAR
@@ -1409,7 +1410,7 @@
   time (&t);
 
   fprintf (fp,
-          "# " APL_SUBCLASS " (%s)  Pid: %u\n# Date: %s\n\n",
+          "# " RESCLASS " (%s)  Pid: %u\n# Date: %s\n\n",
           rs[Rs_name], (unsigned int)getpid (), ctime (&t));
 
   /* dump in reverse order */
@@ -1708,7 +1709,7 @@
             else if ((n = rxvt_Str_match (str, "pixmap:")) != 0)
               {
                 str += n;
-                xterm_seq (XTerm_Pixmap, str, CHAR_ST);
+                process_xterm_seq (XTerm_Pixmap, str, CHAR_ST);
               }
 #if (MENUBAR_MAX > 1)
             else if ((n = rxvt_Str_match (str, "rm")) != 0)
@@ -1756,12 +1757,12 @@
                 /* enough space to hold the results */
                 char            buffer[32];
 
-                sprintf (buffer, "/tmp/" APL_SUBCLASS "-%u",
+                sprintf (buffer, "/tmp/" RESCLASS "-%u",
                         (unsigned int)getpid ());
 
                 if ((fp = fopen (buffer, "wb")) != NULL)
                   {
-                    xterm_seq (XTerm_title, buffer, CHAR_ST);
+                    process_xterm_seq (XTerm_title, buffer, CHAR_ST);
                     menubar_dump (fp);
                     fclose (fp);
                   }
@@ -1848,7 +1849,7 @@
                 if (name == NULL || str == NULL || str <= (name + 1)
                     || (name > path && name[-1] != '/'))
                   {
-                    rxvt_print_error ("menu error <%s>\n", path);
+                    rxvt_warn ("menu error A<%s>, continuing.\n", path);
                     break;
                   }
                 if (str[1] == MENUITEM_BEG)
@@ -1858,7 +1859,7 @@
 
                     if (str == NULL)
                       {
-                        rxvt_print_error ("menu error <%s>\n", path);
+                        rxvt_warn ("menu error B<%s>, continuing.\n", path);
                         break;
                       }
                     name2[-2] = '\0';	/* remove prev MENUITEM_END */