*** names.c.orig	Mon Aug 21 11:50:49 2000
--- names.c	Mon Aug 21 12:18:13 2000
***************
*** 1434,1447 ****
  
  	if (!(tmp = find_channel(channel, window->server)))
  	{
! 		if (window->server != tmp->server)
! 			yell("WARNING! set_channel_window is moving a channel "
! 				"from a window on one server to a window on "
! 				"another server.  This is probably a bug. "
! 				"[%s] [%d] [%d]", channel, tmp->server,
! 							window->server);
  	}
! 	tmp->window = window;
  }
  
  /*
--- 1434,1446 ----
  
  	if (!(tmp = find_channel(channel, window->server)))
  	{
! 		yell("WARNING! set_channel_window is acting on a channel "
! 			"that doesn't exist even though the window is "
! 			"expecting it.  This is probably a bug. "
! 			"[%s] [%d] [%d]", channel, window->server);
  	}
! 	else
! 		tmp->window = window;
  }
  
  /*