--- rxvt-unicode/src/rxvt.C	2003/11/25 15:25:17	1.3
+++ rxvt-unicode/src/rxvt.C	2004/03/17 05:15:02	1.7
@@ -1,16 +1,24 @@
-#include "rxvtlib.h"
-#include "iom.h"
+#include "../config.h"
+#include "rxvt.h"
 
 /*----------------------------------------------------------------------*/
-/* main() */
-/* INTPROTO */
+/* main () */
 int
-main(int argc, const char *const *argv)
-{
-  if (!rxvt_init(argc, argv))
-    return EXIT_FAILURE;
+main (int argc, const char *const *argv)
+try
+  {
+    rxvt_init_signals ();
+
+    rxvt_term *t = new rxvt_term;
 
-  iom.loop ();
+    if (!t->init (argc, argv))
+      return EXIT_FAILURE;
 
-  return EXIT_SUCCESS;
-}
+    iom.loop ();
+
+    return EXIT_SUCCESS;
+  }
+catch (const class rxvt_failure_exception &e)
+  {
+    return EXIT_FAILURE;
+  }