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 18a7ecbcb124aae33295ebde4ca27314bc8e0f44..716431b4a0313d5a61144d5e2580b232157dd17b 100644 (file)
--- 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 84bc75de088fdf584ba45cddd64dcd67baa47906..bb5fde32cf5d6e168dc06a7b247b046ff46008b1 100644 (file)
--- 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: