--- rxvt-unicode/src/main.C	2006/01/20 12:16:28	1.192
+++ rxvt-unicode/src/main.C	2006/01/22 00:48:13	1.195
@@ -172,6 +172,9 @@
 #ifdef USE_XIM
     im_ev (this, &rxvt_term::im_cb),
 #endif
+#ifndef NO_BELL     
+    bell_ev (this, &rxvt_term::bell_cb),
+#endif
     termwin_ev (this, &rxvt_term::x_cb),
     vt_ev (this, &rxvt_term::x_cb),
     child_ev (this, &rxvt_term::child_cb),
@@ -449,8 +452,10 @@
 
 /*----------------------------------------------------------------------*/
 bool
-rxvt_term::init (int argc, const char *const *argv)
+rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
+  this->envv = envv;
+
   SET_R (this);
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
@@ -471,7 +476,7 @@
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
 
-  pty = rxvt_new_ptytty ();
+  pty = ptytty_new ();
 
   create_windows (argc, argv);
 
@@ -556,7 +561,7 @@
       || gid != getegid ())
     {
 #if PTYTTY_HELPER
-      rxvt_ptytty_server ();
+      ptytty_server ();
 #else
       rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
 #endif