pidgin: e119afbe: Patch from Dylan Simon <dylan at dylex.net>...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e119afbe9b2dac774c2d26f65883bfd21b226807
Ancestor: ec507eeb0d289eb6a5a90fa758ab76c6eef70208
Author: sadrul at pidgin.im
Date: 2008-04-24T01:43:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e119afbe9b2dac774c2d26f65883bfd21b226807

Modified files:
        COPYRIGHT finch/libgnt/gntmain.c

ChangeLog: 

Patch from Dylan Simon <dylan at dylex.net> to fix handling escape key
presses. This should fix a bug where pressing esc+w would popup the
window list, and then close immediately. Closes #5615.

-------------- next part --------------
============================================================
--- COPYRIGHT	08921228de93025ef061aaef4545685373e4c002
+++ COPYRIGHT	5b9d56f5744968846cb64e5d7468df21edcad9c3
@@ -360,6 +360,7 @@ Shreevatsa R
 Dossy Shiobara
 Michael Shkutkov
 Shreevatsa R
+Dylan Simon <dylan at dylex.net>
 Ettore Simone
 John Silvestri
 Craig Slusher
============================================================
--- finch/libgnt/gntmain.c	4139f3491963faf3de90b8771796c47196896bbf
+++ finch/libgnt/gntmain.c	09dab2b08828573846c8fa9426e2fa601503cf54
@@ -245,8 +245,11 @@ io_invoke(GIOChannel *source, GIOConditi
 	}
 
 	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 @@ io_invoke(GIOChannel *source, GIOConditi
 		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;
 		}