From: Philip Chimento <philip.chimento@gmail.com>
Date: Sun, 24 May 2009 13:20:35 +0000 (+0000)
Subject: No need to actually cancel input requests when closing a window
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=2b423f4064b36e95ce9c0bd157d35bb2181c21c1;p=rodin%2Fchimara.git

No need to actually cancel input requests when closing a window

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@87 ddfedd41-794f-dd11-ae45-00112f111e67
---

diff --git a/libchimara/input.c b/libchimara/input.c
index 18a7ecb..716431b 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -290,7 +290,7 @@ glk_cancel_line_event(winid_t win, event_t *event)
 		event->val2 = 0;
 	}
 
-	if(win->input_request_type == INPUT_REQUEST_NONE)
+	if(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE)
 		return;
 
 	g_signal_handler_block( G_OBJECT(win->widget), win->keypress_handler );
diff --git a/libchimara/window.c b/libchimara/window.c
index 84bc75d..bb5fde3 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -613,13 +613,9 @@ destroy_windows_below(winid_t win, stream_result_t *result)
 	switch(win->type)
 	{
 		case wintype_Blank:
-			gtk_widget_unparent(win->widget);
-			break;
-	
 	    case wintype_TextGrid:
 		case wintype_TextBuffer:
 			gtk_widget_unparent(win->frame);
-			/* TODO: Cancel all input requests */
 			break;
 
 		case wintype_Pair: