--- a/XWorkstat.st	Mon Jan 19 20:10:31 1998 +0100
+++ b/XWorkstat.st	Mon Jan 19 20:13:02 1998 +0100
@@ -319,8 +319,7 @@
 			event->error_code, lastErrorMsg);
     }
 
-    __errorInterruptWithIDAndParameter__(@symbol(DisplayError), 
-					 __MKEXTERNALADDRESS(dpy));
+    __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKEXTERNALADDRESS(dpy));
     return 0;
 }
 
@@ -366,11 +365,11 @@
      * the scheduler may try to ask for pending events without a watchdog
      * timer ...
      */
-    __SSEND0(displayDeviceInst, @symbol(requestTimeoutError), 0);
-
-    __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOTimeoutError), 
-						  displayDeviceInst);
+    __OINST(displayDeviceInst, displayId) = nil;
+
+    __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOTimeoutError), displayDeviceInst);
     __internalError("unhandled display Timeout error");
+
     __terminateProcess(0);      /* soft terminate */
     __terminateProcess(1);      /* hard terminate */
 }
@@ -7699,11 +7698,6 @@
     virtualRootId := rootId := nil.
     super reinitialize.
     dispatchingExpose := nil
-!
-
-requestTimeoutError
-    "/ 'clearing displayID ...' errorPrintCR.
-    displayId := nil.
 ! !
 
 !XWorkstation methodsFor:'keyboard mapping'!
@@ -9896,6 +9890,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.271 1998-01-12 21:31:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.272 1998-01-19 19:13:02 cg Exp $'
 ! !
 XWorkstation initialize!

--- a/XWorkstation.st	Mon Jan 19 20:10:31 1998 +0100
+++ b/XWorkstation.st	Mon Jan 19 20:13:02 1998 +0100
@@ -319,8 +319,7 @@
 			event->error_code, lastErrorMsg);
     }
 
-    __errorInterruptWithIDAndParameter__(@symbol(DisplayError), 
-					 __MKEXTERNALADDRESS(dpy));
+    __errorInterruptWithIDAndParameter__(@symbol(DisplayError), __MKEXTERNALADDRESS(dpy));
     return 0;
 }
 
@@ -366,11 +365,11 @@
      * the scheduler may try to ask for pending events without a watchdog
      * timer ...
      */
-    __SSEND0(displayDeviceInst, @symbol(requestTimeoutError), 0);
-
-    __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOTimeoutError), 
-						  displayDeviceInst);
+    __OINST(displayDeviceInst, displayId) = nil;
+
+    __immediateErrorInterruptWithIDAndParameter__(@symbol(DisplayIOTimeoutError), displayDeviceInst);
     __internalError("unhandled display Timeout error");
+
     __terminateProcess(0);      /* soft terminate */
     __terminateProcess(1);      /* hard terminate */
 }
@@ -7699,11 +7698,6 @@
     virtualRootId := rootId := nil.
     super reinitialize.
     dispatchingExpose := nil
-!
-
-requestTimeoutError
-    "/ 'clearing displayID ...' errorPrintCR.
-    displayId := nil.
 ! !
 
 !XWorkstation methodsFor:'keyboard mapping'!
@@ -9896,6 +9890,6 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.271 1998-01-12 21:31:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.272 1998-01-19 19:13:02 cg Exp $'
 ! !
 XWorkstation initialize!