diff --git a/xchat-wdk.patch b/xchat-wdk.patch
index f9da4d0c..4d358ce4 100644
--- a/xchat-wdk.patch
+++ b/xchat-wdk.patch
@@ -1,6 +1,6 @@
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c
---- xchat-wdk.orig/plugins/perl/perl.c	2010-08-26 04:18:04 +0200
-+++ xchat-wdk/plugins/perl/perl.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/plugins/perl/perl.c	2010-08-26 02:18:04 +0000
++++ xchat-wdk/plugins/perl/perl.c	2010-09-22 15:30:07 +0000
 @@ -22,12 +22,15 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -40,8 +40,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi
  				}
  			}
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c
---- xchat-wdk.orig/plugins/python/python.c	2010-05-16 06:31:54 +0200
-+++ xchat-wdk/plugins/python/python.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/plugins/python/python.c	2010-05-16 04:31:54 +0000
++++ xchat-wdk/plugins/python/python.c	2010-09-22 15:30:07 +0000
 @@ -53,10 +53,10 @@
  
  #include <glib.h>
@@ -102,8 +102,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
  					 "__main__");
  		if (m == NULL) {
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c
---- xchat-wdk.orig/plugins/tcl/tclplugin.c	2010-03-21 01:49:42 +0100
-+++ xchat-wdk/plugins/tcl/tclplugin.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/plugins/tcl/tclplugin.c	2010-03-21 00:49:42 +0000
++++ xchat-wdk/plugins/tcl/tclplugin.c	2010-09-22 15:30:07 +0000
 @@ -32,8 +32,6 @@
  #include <windows.h>
  #define bzero(mem, sz) memset((mem), 0, (sz))
@@ -123,8 +123,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
      }
      FreeLibrary(lib);
 diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugins/xdcc/xdcc.c
---- xchat-wdk.orig/plugins/xdcc/xdcc.c	2002-12-26 04:35:09 +0100
-+++ xchat-wdk/plugins/xdcc/xdcc.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/plugins/xdcc/xdcc.c	2002-12-26 03:35:09 +0000
++++ xchat-wdk/plugins/xdcc/xdcc.c	2010-09-22 15:30:07 +0000
 @@ -2,11 +2,11 @@
  
  #include <glib.h>
@@ -139,8 +139,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugi
  static xchat_plugin *ph;	/* plugin handle */
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
---- xchat-wdk.orig/src/common/cfgfiles.c	2010-08-07 09:14:45 +0200
-+++ xchat-wdk/src/common/cfgfiles.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/cfgfiles.c	2010-08-07 07:14:45 +0000
++++ xchat-wdk/src/common/cfgfiles.c	2010-09-22 15:30:07 +0000
 @@ -17,7 +17,6 @@
   */
  
@@ -204,8 +204,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
  	prefs.dccstalltimeout = 60;
  	prefs.notify_timeout = 15;
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/common/chanopt.c
---- xchat-wdk.orig/src/common/chanopt.c	2008-06-15 06:40:29 +0200
-+++ xchat-wdk/src/common/chanopt.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/chanopt.c	2008-06-15 04:40:29 +0000
++++ xchat-wdk/src/common/chanopt.c	2010-09-22 15:30:07 +0000
 @@ -3,7 +3,6 @@
  #include <stdio.h>
  #include <string.h>
@@ -215,8 +215,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/
  #include <sys/stat.h>
  #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/common/ctcp.c
---- xchat-wdk.orig/src/common/ctcp.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/ctcp.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/ctcp.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/ctcp.c	2010-09-22 15:30:07 +0000
 @@ -18,7 +18,6 @@
  
  #include <stdio.h>
@@ -235,8 +235,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/com
  		serv->p_nctcp (serv, nick, outbuf);
  	}
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/common/dcc.c
---- xchat-wdk.orig/src/common/dcc.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/dcc.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/dcc.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/dcc.c	2010-09-22 15:30:07 +0000
 @@ -31,7 +31,6 @@
  #include <time.h>
  #include <errno.h>
@@ -255,8 +255,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/comm
  	/* this fstat() shouldn't really fail */
  	if ((dcc->fp == -1 ? stat (dcc->destfile_fs, &st_a) : fstat (dcc->fp, &st_a)) == -1)
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/common/ignore.c
---- xchat-wdk.orig/src/common/ignore.c	2006-04-15 09:00:39 +0200
-+++ xchat-wdk/src/common/ignore.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/ignore.c	2006-04-15 07:00:39 +0000
++++ xchat-wdk/src/common/ignore.c	2010-09-22 15:30:07 +0000
 @@ -19,7 +19,6 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -266,8 +266,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/c
  #include <sys/stat.h>
  #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/common/inbound.c
---- xchat-wdk.orig/src/common/inbound.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/inbound.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/inbound.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/inbound.c	2010-09-22 15:30:07 +0000
 @@ -21,7 +21,6 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -277,8 +277,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/
  
  #define WANTARPA
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h
---- xchat-wdk.orig/src/common/inet.h	2005-09-03 12:57:48 +0200
-+++ xchat-wdk/src/common/inet.h	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/inet.h	2005-09-03 10:57:48 +0000
++++ xchat-wdk/src/common/inet.h	2010-09-22 15:30:07 +0000
 @@ -24,9 +24,8 @@
  #ifdef USE_IPV6
  #include <winsock2.h>
@@ -291,8 +291,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/com
  
  #define set_blocking(sok)	{ \
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/common/msproxy.c
---- xchat-wdk.orig/src/common/msproxy.c	2006-04-16 17:32:17 +0200
-+++ xchat-wdk/src/common/msproxy.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/msproxy.c	2006-04-16 15:32:17 +0000
++++ xchat-wdk/src/common/msproxy.c	2010-09-22 15:30:07 +0000
 @@ -26,7 +26,6 @@
  #include <stdio.h>
  #include <string.h>
@@ -302,8 +302,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/
  
  #define WANTSOCKET
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/common/network.c
---- xchat-wdk.orig/src/common/network.c	2006-04-16 10:11:26 +0200
-+++ xchat-wdk/src/common/network.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/network.c	2006-04-16 08:11:26 +0000
++++ xchat-wdk/src/common/network.c	2010-09-22 15:30:07 +0000
 @@ -21,7 +21,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -313,8 +313,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/
  
  #include "../../config.h"				  /* grab USE_IPV6 and LOOKUPD defines */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/common/notify.c
---- xchat-wdk.orig/src/common/notify.c	2008-06-08 09:58:58 +0200
-+++ xchat-wdk/src/common/notify.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/notify.c	2008-06-08 07:58:58 +0000
++++ xchat-wdk/src/common/notify.c	2010-09-22 15:30:07 +0000
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -324,8 +324,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/c
  
  #include "xchat.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src/common/outbound.c
---- xchat-wdk.orig/src/common/outbound.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/outbound.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/outbound.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/outbound.c	2010-09-22 15:30:07 +0000
 @@ -32,7 +32,6 @@
  #include <sys/wait.h>
  #endif
@@ -335,8 +335,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
  #include <signal.h>
  #include <sys/stat.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c
---- xchat-wdk.orig/src/common/plugin-timer.c	2005-02-02 11:03:51 +0100
-+++ xchat-wdk/src/common/plugin-timer.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/plugin-timer.c	2005-02-02 10:03:51 +0000
++++ xchat-wdk/src/common/plugin-timer.c	2010-09-22 15:30:07 +0000
 @@ -1,7 +1,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -347,8 +347,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk
  #ifdef WIN32
  #define strcasecmp stricmp
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c
---- xchat-wdk.orig/src/common/plugin.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/common/plugin.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/plugin.c	2010-08-14 01:46:21 +0000
++++ xchat-wdk/src/common/plugin.c	2010-09-22 15:30:07 +0000
 @@ -34,7 +34,7 @@
  #include "text.h"
  #define PLUGIN_C
@@ -368,8 +368,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/c
  	static const char * const channels_fields[] =
  	{
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c
---- xchat-wdk.orig/src/common/proto-irc.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/proto-irc.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/proto-irc.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/proto-irc.c	2010-09-22 15:30:07 +0000
 @@ -18,7 +18,6 @@
  
  /* IRC RFC1459(+commonly used extensions) protocol implementation */
@@ -379,8 +379,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr
  #include <stdio.h>
  #include <stdlib.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/common/server.c
---- xchat-wdk.orig/src/common/server.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/server.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/server.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/server.c	2010-09-22 15:30:07 +0000
 @@ -26,7 +26,6 @@
  #include <stdio.h>
  #include <string.h>
@@ -408,8 +408,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
  }
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src/common/servlist.c
---- xchat-wdk.orig/src/common/servlist.c	2010-05-16 09:43:49 +0200
-+++ xchat-wdk/src/common/servlist.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/servlist.c	2010-05-16 07:43:49 +0000
++++ xchat-wdk/src/common/servlist.c	2010-09-22 15:30:07 +0000
 @@ -21,7 +21,6 @@
  #include <string.h>
  #include <sys/types.h>
@@ -419,8 +419,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src
  #include "xchat.h"
  #include <glib/ghash.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c
---- xchat-wdk.orig/src/common/ssl.c	2007-03-28 10:35:06 +0200
-+++ xchat-wdk/src/common/ssl.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/ssl.c	2007-03-28 08:35:06 +0000
++++ xchat-wdk/src/common/ssl.c	2010-09-22 15:30:07 +0000
 @@ -17,12 +17,12 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
@@ -436,8 +436,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm
  
  #ifndef HAVE_SNPRINTF
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c
---- xchat-wdk.orig/src/common/text.c	2010-05-30 04:28:04 +0200
-+++ xchat-wdk/src/common/text.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/text.c	2010-05-30 02:28:04 +0000
++++ xchat-wdk/src/common/text.c	2010-09-22 15:30:07 +0000
 @@ -19,13 +19,11 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -514,8 +514,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/com
  }
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c
---- xchat-wdk.orig/src/common/util.c	2008-02-07 02:50:37 +0100
-+++ xchat-wdk/src/common/util.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/util.c	2008-02-07 01:50:37 +0000
++++ xchat-wdk/src/common/util.c	2010-09-22 15:30:07 +0000
 @@ -16,11 +16,13 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
@@ -600,8 +600,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
  	return verbuf;
  }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c
---- xchat-wdk.orig/src/common/xchat.c	2008-06-08 09:58:58 +0200
-+++ xchat-wdk/src/common/xchat.c	2010-09-19 05:45:58 +0200
+--- xchat-wdk.orig/src/common/xchat.c	2008-06-08 07:58:58 +0000
++++ xchat-wdk/src/common/xchat.c	2010-09-22 15:30:07 +0000
 @@ -22,7 +22,6 @@
  #include <time.h>
  #include <sys/types.h>
@@ -628,8 +628,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
  	"NAME KILL\n"			"CMD quote KILL %2 :&3\n\n"\
  	"NAME LEAVE\n"			"CMD part &2\n\n"\
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
---- xchat-wdk.orig/src/common/xchat.h	2010-08-07 09:14:45 +0200
-+++ xchat-wdk/src/common/xchat.h	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/common/xchat.h	2010-08-07 07:14:45 +0000
++++ xchat-wdk/src/common/xchat.h	2010-09-22 15:30:07 +0000
 @@ -12,12 +12,14 @@
  
  #include "history.h"
@@ -664,8 +664,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
  	unsigned int ctcp_number_limit;	/*flood */
  	unsigned int ctcp_time_limit;	/*seconds of floods */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe-gtk/about.c
---- xchat-wdk.orig/src/fe-gtk/about.c	2010-05-16 09:43:49 +0200
-+++ xchat-wdk/src/fe-gtk/about.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/about.c	2010-05-16 07:43:49 +0000
++++ xchat-wdk/src/fe-gtk/about.c	2010-09-22 15:30:07 +0000
 @@ -39,6 +39,7 @@
  
  #include "../common/xchat.h"
@@ -731,8 +731,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
  	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/fe-gtk/banlist.c
---- xchat-wdk.orig/src/fe-gtk/banlist.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/banlist.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/banlist.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/banlist.c	2010-09-22 15:30:07 +0000
 @@ -19,7 +19,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -742,8 +742,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/
  #include <time.h>
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src/fe-gtk/chanlist.c
---- xchat-wdk.orig/src/fe-gtk/chanlist.c	2008-02-24 04:46:02 +0100
-+++ xchat-wdk/src/fe-gtk/chanlist.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/chanlist.c	2008-02-24 03:46:02 +0000
++++ xchat-wdk/src/fe-gtk/chanlist.c	2010-09-22 18:13:19 +0000
 @@ -19,7 +19,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -752,9 +752,36 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src
  #include <fcntl.h>
  #include <time.h>
  
+@@ -671,6 +670,17 @@
+ #endif
+ }
+ 
++static gboolean
++chanlist_key_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata)
++{
++	if (key->keyval == GDK_Escape)
++	{
++		gtk_widget_destroy (window);
++	}
++
++	return FALSE;
++}
++
+ static void
+ chanlist_closegui (GtkWidget *wid, server *serv)
+ {
+@@ -928,6 +938,8 @@
+ 
+ 	g_signal_connect (G_OBJECT (serv->gui->chanlist_window), "destroy",
+ 							G_CALLBACK (chanlist_destroy_widget), serv);
++	g_signal_connect (G_OBJECT (serv->gui->chanlist_window), "key_press_event",
++							G_CALLBACK (chanlist_key_cb), serv);
+ 
+ 	/* reset the counters. */
+ 	chanlist_reset_counters (serv);
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src/fe-gtk/editlist.c
---- xchat-wdk.orig/src/fe-gtk/editlist.c	2006-03-13 09:33:45 +0100
-+++ xchat-wdk/src/fe-gtk/editlist.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/editlist.c	2006-03-13 08:33:45 +0000
++++ xchat-wdk/src/fe-gtk/editlist.c	2010-09-22 15:30:07 +0000
 @@ -19,7 +19,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -764,8 +791,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
  #include <sys/types.h>
  #include <sys/stat.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/fe-gtk/fe-gtk.c
---- xchat-wdk.orig/src/fe-gtk/fe-gtk.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/fe-gtk/fe-gtk.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/fe-gtk.c	2010-08-14 01:46:21 +0000
++++ xchat-wdk/src/fe-gtk/fe-gtk.c	2010-09-22 15:30:07 +0000
 @@ -19,7 +19,6 @@
  #include <stdio.h>
  #include <string.h>
@@ -801,8 +828,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f
  
  	sess = find_dialog (serv_list->data, "(warnings)");
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/fe-gtk/fe-gtk.h
---- xchat-wdk.orig/src/fe-gtk/fe-gtk.h	2010-05-30 08:31:29 +0200
-+++ xchat-wdk/src/fe-gtk/fe-gtk.h	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/fe-gtk.h	2010-05-30 06:31:29 +0000
++++ xchat-wdk/src/fe-gtk/fe-gtk.h	2010-09-22 15:30:07 +0000
 @@ -4,7 +4,7 @@
  /* If you're compiling this for Windows, your release is un-official
   * and not condoned. Please don't use the XChat name. Make up your
@@ -813,8 +840,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/f
  #define DISPLAY_NAME "XChat"
  #endif
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe-gtk/fkeys.c
---- xchat-wdk.orig/src/fe-gtk/fkeys.c	2008-02-24 06:09:34 +0100
-+++ xchat-wdk/src/fe-gtk/fkeys.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/fkeys.c	2008-02-24 05:09:34 +0000
++++ xchat-wdk/src/fe-gtk/fkeys.c	2010-09-22 15:30:07 +0000
 @@ -20,7 +20,6 @@
  #include <stdlib.h>
  #include <sys/types.h>
@@ -824,8 +851,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe
  #include <fcntl.h>
  #include <ctype.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/fe-gtk/gtkutil.c
---- xchat-wdk.orig/src/fe-gtk/gtkutil.c	2009-07-18 14:38:10 +0200
-+++ xchat-wdk/src/fe-gtk/gtkutil.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/gtkutil.c	2009-07-18 12:38:10 +0000
++++ xchat-wdk/src/fe-gtk/gtkutil.c	2010-09-22 15:30:07 +0000
 @@ -22,7 +22,6 @@
  #include <stdarg.h>
  #include <sys/types.h>
@@ -835,8 +862,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/
  #include "fe-gtk.h"
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe-gtk/joind.c
---- xchat-wdk.orig/src/fe-gtk/joind.c	2006-12-26 05:56:55 +0100
-+++ xchat-wdk/src/fe-gtk/joind.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/joind.c	2006-12-26 04:56:55 +0000
++++ xchat-wdk/src/fe-gtk/joind.c	2010-09-22 15:30:07 +0000
 @@ -9,7 +9,6 @@
  
  #include <sys/types.h>
@@ -846,8 +873,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe
  #include <stdio.h>
  
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/fe-gtk/maingui.c
---- xchat-wdk.orig/src/fe-gtk/maingui.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/maingui.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/maingui.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/maingui.c	2010-09-22 15:30:07 +0000
 @@ -214,60 +214,10 @@
  	away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE);
  }
@@ -954,8 +981,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
  	return FALSE;
  }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-gtk/menu.c
---- xchat-wdk.orig/src/fe-gtk/menu.c	2010-05-16 06:24:24 +0200
-+++ xchat-wdk/src/fe-gtk/menu.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/menu.c	2010-05-16 04:24:24 +0000
++++ xchat-wdk/src/fe-gtk/menu.c	2010-09-22 15:30:07 +0000
 @@ -20,7 +20,6 @@
  #include <stdlib.h>
  #include <fcntl.h>
@@ -965,8 +992,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
  #ifdef WIN32
  #include <windows.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/fe-gtk/palette.c
---- xchat-wdk.orig/src/fe-gtk/palette.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/palette.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/palette.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/palette.c	2010-09-22 15:30:07 +0000
 @@ -18,7 +18,6 @@
  
  #include <stdio.h>
@@ -976,8 +1003,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
  #include <sys/stat.h>
  #include <fcntl.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c
---- xchat-wdk.orig/src/fe-gtk/plugin-tray.c	2010-08-14 03:46:21 +0200
-+++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/plugin-tray.c	2010-08-14 01:46:21 +0000
++++ xchat-wdk/src/fe-gtk/plugin-tray.c	2010-09-22 15:30:07 +0000
 @@ -1,8 +1,7 @@
  /* Copyright (C) 2006-2007 Peter Zelezny. */
  
@@ -1103,8 +1130,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
  
  	return 1;       /* return 1 for success */
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c
---- xchat-wdk.orig/src/fe-gtk/plugingui.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/plugingui.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/plugingui.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/plugingui.c	2010-09-22 15:30:07 +0000
 @@ -35,7 +35,7 @@
  #include "../common/xchat.h"
  #define PLUGIN_C
@@ -1115,8 +1142,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/sr
  #include "../common/util.h"
  #include "../common/outbound.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c
---- xchat-wdk.orig/src/fe-gtk/rawlog.c	2010-05-16 05:20:22 +0200
-+++ xchat-wdk/src/fe-gtk/rawlog.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/rawlog.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/rawlog.c	2010-09-22 15:30:07 +0000
 @@ -19,7 +19,6 @@
  #include <stdio.h>
  #include <string.h>
@@ -1125,10 +1152,104 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f
  #include <stdlib.h>
  
  #include "fe-gtk.h"
+diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/fe-gtk/search.c
+--- xchat-wdk.orig/src/fe-gtk/search.c	2010-05-16 03:20:22 +0000
++++ xchat-wdk/src/fe-gtk/search.c	2010-09-22 18:22:22 +0000
+@@ -153,7 +153,7 @@
+ 								_("_Find"));
+ 	g_object_set_data (G_OBJECT (wid), "e", entry);
+ 
+-	g_signal_connect (G_OBJECT (win), "key-press-event", G_CALLBACK (search_key_cb), win);
++	g_signal_connect (G_OBJECT (win), "key_press_event", G_CALLBACK (search_key_cb), win);
+ 
+ 	gtk_widget_show (win);
+ }
+diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/src/fe-gtk/servlistgui.c
+--- xchat-wdk.orig/src/fe-gtk/servlistgui.c	2010-08-07 07:14:45 +0000
++++ xchat-wdk/src/fe-gtk/servlistgui.c	2010-09-22 17:30:33 +0000
+@@ -486,6 +486,41 @@
+ 	return FALSE;
+ }
+ 
++static gboolean 
++servlist_netwin_keypress_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata)
++{
++	if (key->keyval == GDK_Escape)
++	{
++		gtk_widget_destroy (window);
++	}
++
++	serverlist_win = NULL;
++	selected_net = NULL;
++	return FALSE;
++}
++
++static gboolean 
++servlist_servwin_keypress_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata)
++{
++	if (key->keyval == GDK_Escape)
++	{
++		gtk_widget_destroy (window);
++	}
++
++	return FALSE;
++}
++
++static gboolean 
++servlist_autojoinedit_keypress_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata)
++{
++	if (key->keyval == GDK_Escape)
++	{
++		gtk_widget_destroy (window);
++	}
++
++	return FALSE;
++}
++
+ static void
+ servlist_edit_cb (GtkWidget *but, gpointer none)
+ {
+@@ -501,6 +536,9 @@
+ 						 	G_CALLBACK (servlist_editwin_delete_cb), 0);
+ 	g_signal_connect (G_OBJECT (edit_tree), "key_press_event",
+ 							G_CALLBACK (servlist_serv_keypress_cb), 0);
++	g_signal_connect (G_OBJECT (edit_win), "key_press_event",
++							G_CALLBACK (servlist_servwin_keypress_cb), edit_win);
++	
+ 	gtk_widget_show (edit_win);
+ }
+ 
+@@ -961,6 +999,9 @@
+ 	}
+ 
+ 	fav_add_net = net;
++	
++	g_signal_connect (G_OBJECT (win), "key_press_event",
++							G_CALLBACK (servlist_autojoinedit_keypress_cb), win);
+ 
+ 	gtk_widget_show (win);
+ }
+@@ -1875,6 +1916,8 @@
+ 							"changed", G_CALLBACK (servlist_network_row_cb), NULL);
+ 	g_signal_connect (G_OBJECT (networks_tree), "key_press_event",
+ 							G_CALLBACK (servlist_net_keypress_cb), networks_tree);
++	g_signal_connect (G_OBJECT (serverlist_win), "key_press_event", 
++							G_CALLBACK (servlist_netwin_keypress_cb), serverlist_win);
+ 
+ 	gtk_widget_show (serverlist_win);
+ }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c
---- xchat-wdk.orig/src/fe-gtk/setup.c	2008-02-08 10:04:45 +0100
-+++ xchat-wdk/src/fe-gtk/setup.c	2010-09-19 05:27:43 +0200
-@@ -363,7 +363,6 @@
+--- xchat-wdk.orig/src/fe-gtk/setup.c	2008-02-08 09:04:45 +0000
++++ xchat-wdk/src/fe-gtk/setup.c	2010-09-22 18:03:18 +0000
+@@ -47,6 +47,7 @@
+ #include <gtk/gtktreeselection.h>
+ #include <gtk/gtkcellrenderertext.h>
+ #include <gtk/gtkhscale.h>
++#include <gdk/gdkkeysyms.h>
+ #ifdef WIN32
+ #include "../common/fe.h"
+ #endif
+@@ -363,7 +364,6 @@
  	{ST_END, 0, 0, 0, 0, 0}
  };
  
@@ -1136,7 +1257,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
  static const setting advanced_settings[] =
  {
  	{ST_HEADER,	N_("Advanced Settings"),0,0,0},
-@@ -378,7 +377,6 @@
+@@ -378,7 +378,6 @@
  
  	{ST_END, 0, 0, 0, 0, 0}
  };
@@ -1144,7 +1265,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
  
  static const setting logging_settings[] =
  {
-@@ -1708,7 +1706,7 @@
+@@ -1708,7 +1707,7 @@
  		N_("General"),
  		N_("Logging"),
  		N_("Sound"),
@@ -1153,7 +1274,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
  		NULL,
  	N_("Network"),
  		N_("Network setup"),
-@@ -1733,6 +1731,7 @@
+@@ -1733,6 +1732,7 @@
  	setup_add_page (cata[9], book, setup_create_page (general_settings));
  	setup_add_page (cata[10], book, setup_create_page (logging_settings));
  	setup_add_page (cata[11], book, setup_create_sound_page ());
@@ -1161,9 +1282,36 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
  	setup_add_page (cata[14], book, setup_create_page (network_settings));
  	setup_add_page (cata[15], book, setup_create_page (filexfer_settings));
  
+@@ -2050,6 +2050,17 @@
+ 	palette_save ();
+ }
+ 
++static gboolean
++setup_key_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata)
++{
++	if (key->keyval == GDK_Escape)
++	{
++		gtk_widget_destroy (window);
++	}
++
++	return FALSE;
++}
++
+ static GtkWidget *
+ setup_window_open (void)
+ {
+@@ -2095,6 +2106,8 @@
+ 
+ 	wid = gtk_hseparator_new ();
+ 	gtk_box_pack_end (GTK_BOX (vbox), wid, FALSE, FALSE, 0);
++	
++	g_signal_connect (G_OBJECT (win), "key_press_event", G_CALLBACK (setup_key_cb), win);
+ 
+ 	gtk_widget_show_all (win);
+ 
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
---- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c	2006-07-17 07:51:02 +0200
-+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c	2006-07-17 05:51:02 +0000
++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-09-22 15:30:07 +0000
 @@ -31,6 +31,20 @@
  /*#include "gtkspell-iso-codes.h"
  #include "sexy-marshal.h"*/
@@ -1186,8 +1334,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat
   * Bunch of poop to make enchant into a runtime dependency rather than a
   * compile-time dependency.  This makes it so I don't have to hear the
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c
---- xchat-wdk.orig/src/fe-gtk/xtext.c	2008-08-29 13:24:17 +0200
-+++ xchat-wdk/src/fe-gtk/xtext.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-gtk/xtext.c	2008-08-29 11:24:17 +0000
++++ xchat-wdk/src/fe-gtk/xtext.c	2010-09-22 15:30:07 +0000
 @@ -42,7 +42,6 @@
  #include <ctype.h>
  #include <stdlib.h>
@@ -1197,8 +1345,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe
  #include <gtk/gtksignal.h>
  #include <gtk/gtkselection.h>
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src/fe-text/fe-text.c
---- xchat-wdk.orig/src/fe-text/fe-text.c	2008-08-29 13:24:17 +0200
-+++ xchat-wdk/src/fe-text/fe-text.c	2010-09-19 05:27:43 +0200
+--- xchat-wdk.orig/src/fe-text/fe-text.c	2008-08-29 11:24:17 +0000
++++ xchat-wdk/src/fe-text/fe-text.c	2010-09-22 15:30:07 +0000
 @@ -22,9 +22,13 @@
  #ifdef HAVE_STRINGS_H
  #include <strings.h>