update.

[chise/xemacs-chise.git-] / src / tooltalk.c

diff --git a/src/tooltalk.c b/src/tooltalk.c
index ac76e22..3f24b2e 100644 (file)
--- a/src/tooltalk.c
+++ b/src/tooltalk.c
@@ -175,7 +175,7 @@ print_tooltalk_message (Lisp_Object obj, Lisp_Object printcharfun,
 
 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
                                mark_tooltalk_message, print_tooltalk_message,
-                               0, 0, 0,
+                               0, 0, 0, 0,
                               struct Lisp_Tooltalk_Message);
 \f
 static Lisp_Object
@@ -184,7 +184,7 @@ make_tooltalk_message (Tt_message m)
   Lisp_Object val;
   struct Lisp_Tooltalk_Message *msg =
     alloc_lcrecord_type (struct Lisp_Tooltalk_Message,
-                        lrecord_tooltalk_message);
+                        &lrecord_tooltalk_message);
 
   msg->m = m;
   msg->callback = Qnil;
@@ -249,7 +249,7 @@ print_tooltalk_pattern (Lisp_Object obj, Lisp_Object printcharfun,
 
 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
                                mark_tooltalk_pattern, print_tooltalk_pattern,
-                               0, 0, 0,
+                               0, 0, 0, 0,
                               struct Lisp_Tooltalk_Pattern);
 \f
 static Lisp_Object
@@ -257,7 +257,7 @@ make_tooltalk_pattern (Tt_pattern p)
 {
   struct Lisp_Tooltalk_Pattern *pat =
     alloc_lcrecord_type (struct Lisp_Tooltalk_Pattern,
-                        lrecord_tooltalk_pattern);
+                        &lrecord_tooltalk_pattern);
   Lisp_Object val;
 
   pat->p = p;
@@ -1256,7 +1256,28 @@ init_tooltalk (void)
   Lisp_Object lp;
   Lisp_Object fil;
 
+
+  /* tt_open() messes with our signal handler flags (at least when no 
+     ttsessions is running on the machine), therefore we save the 
+     actions and restore them after the call */
+#ifdef HAVE_SIGPROCMASK
+  {
+    struct sigaction ActSIGQUIT;
+    struct sigaction ActSIGINT;
+    struct sigaction ActSIGCHLD;
+    sigaction (SIGQUIT, NULL, &ActSIGQUIT);
+    sigaction (SIGINT, NULL, &ActSIGINT);
+    sigaction (SIGCHLD, NULL, &ActSIGCHLD);
+#endif
   retval = tt_open ();
+#ifdef HAVE_SIGPROCMASK
+    sigaction (SIGQUIT, &ActSIGQUIT, NULL);
+    sigaction (SIGINT, &ActSIGINT, NULL);
+    sigaction (SIGCHLD, &ActSIGCHLD, NULL);
+  }
+#endif
+
+
   if (tt_ptr_error (retval) != TT_OK)
     return;