--- rxvt-unicode/src/rxvt.C	2004/04/08 20:31:45	1.8
+++ rxvt-unicode/src/rxvt.C	2006/01/22 00:36:59	1.11
@@ -23,18 +23,28 @@
 #include "../config.h"
 #include "rxvt.h"
 
+#include <cstdlib>
+#include <cstring>
+
 int
 main (int argc, const char *const *argv)
 try
   {
-    rxvt_init_signals ();
+    rxvt_init ();
+
+    stringvec *envv = new stringvec;
+
+    for (char **var = environ; *var; var++)
+      envv->push_back (strdup (*var));
+
+    envv->push_back (0);
 
     rxvt_term *t = new rxvt_term;
 
-    if (!t->init (argc, argv))
+    if (!t->init (argc, argv, envv))
       return EXIT_FAILURE;
 
-    iom.loop ();
+    io_manager::loop ();
 
     return EXIT_SUCCESS;
   }