# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1209001598 0
# Node ID e587650c5d1683f78eae31bbae11ce9782fcf85b
# Parent  387071b0d4d4ef41448a193bacdc5fd1761be7b8# Parent  8d74a9e409f1292b9f798ed0ca64e0e1c2eb26b6
merge of '9448aec0bc0e0168e10e0a3991bfbfe716de6c86'
     and 'e119afbe9b2dac774c2d26f65883bfd21b226807'

diff -r 387071b0d4d4 -r e587650c5d16 COPYRIGHT
--- a/COPYRIGHT	Wed Apr 23 17:10:43 2008 +0000
+++ b/COPYRIGHT	Thu Apr 24 01:46:38 2008 +0000
@@ -360,6 +360,7 @@
 Dossy Shiobara
 Michael Shkutkov
 Shreevatsa R
+Dylan Simon <dylan@dylex.net>
 Ettore Simone
 John Silvestri
 Craig Slusher
diff -r 387071b0d4d4 -r e587650c5d16 finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c	Wed Apr 23 17:10:43 2008 +0000
+++ b/finch/libgnt/gntmain.c	Thu Apr 24 01:46:38 2008 +0000
@@ -245,8 +245,11 @@
 	}
 
 	rd += HOLDING_ESCAPE;
-	if (HOLDING_ESCAPE)
+	if (HOLDING_ESCAPE) {
 		keys[0] = '\033';
+		g_source_remove(escape_stuff.timer);
+		escape_stuff.timer = 0;
+	}
 	keys[rd] = 0;
 	gnt_wm_set_event_stack(wm, TRUE);
 
@@ -271,12 +274,6 @@
 		int p;
 
 		if (k[0] == '\033' && rd == 1) {
-			if (escape_stuff.timer) {
-				gnt_wm_process_input(wm, "\033\033");
-				g_source_remove(escape_stuff.timer);
-				escape_stuff.timer = 0;
-				break;
-			}
 			escape_stuff.timer = g_timeout_add(250, escape_timeout, NULL);
 			break;
 		}