diff --git a/ChangeLog b/ChangeLog
index 680baf9..ed48cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-05 03:29  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/x11/XGServerEvent.m (-receivedEvent:type:extra:forMode:):
+	Casts as lvalues will be deprecated in gcc 3.4. Thus, don't assign
+	to the cWin macro. Reported by Lyndon Tremblay.
+
 2003-11-02 02:58  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/gsc/GSStreamContext.m Whitespace cleanups.
diff --git a/Source/x11/XGServerEvent.m b/Source/x11/XGServerEvent.m
index a5f2491..0a78cfd 100644
--- a/Source/x11/XGServerEvent.m
+++ b/Source/x11/XGServerEvent.m
@@ -914,7 +914,7 @@ static inline int check_modifier (XEvent *xEvent, KeyCode key_code)
 	    XGetInputFocus(xEvent.xfocus.display, &fw, &rev);
 	    NSDebugLLog(@"NSEvent", @"%d FocusOut\n",
 			xEvent.xfocus.window);
-	    cWin = [XGServer _windowForXWindow: fw];
+	    generic.cachedWindow = [XGServer _windowForXWindow: fw];
 	    if (cWin == 0)
 	      {
 		cWin = [XGServer _windowForXParent: fw];