From e46814b46ac4687de519dfdd0fd8f578cfa17946 Mon Sep 17 00:00:00 2001 From: Lucas Rocha Date: Fri, 28 Jul 2006 04:18:58 +0000 Subject: [PATCH] correctly stdin input for text info dialog (Fixes bug #336736). 2006-07-27 Lucas Rocha * src/text.c (zenity_text_handle_stdin): correctly stdin input for text info dialog (Fixes bug #336736). --- ChangeLog | 5 +++++ src/text.c | 55 ++++++++++++++++++++++++------------------------------ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1aff1ee..c25ac14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-27 Lucas Rocha + + * src/text.c (zenity_text_handle_stdin): correctly stdin input for + text info dialog (Fixes bug #336736). + 2006-07-27 Lucas Rocha * src/entry.c (zenity_entry): entry activation makes dialog diff --git a/src/text.c b/src/text.c index f3b331d..1a4a322 100644 --- a/src/text.c +++ b/src/text.c @@ -43,50 +43,43 @@ zenity_text_handle_stdin (GIOChannel *channel, buffer = GTK_TEXT_BUFFER (data); - if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) { + if ((condition & G_IO_IN) || (condition & (G_IO_IN | G_IO_HUP))) { GError *error = NULL; + gint status; while (channel->is_readable != TRUE) ; + do { - gint status; + status = g_io_channel_read_chars (channel, buf, 1024, &len, &error); - do { - status = g_io_channel_read_chars (channel, buf, 1024, &len, &error); + while (gtk_events_pending ()) + gtk_main_iteration (); - while (gtk_events_pending ()) - gtk_main_iteration (); + } while (status == G_IO_STATUS_AGAIN); - } while (status == G_IO_STATUS_AGAIN); - - if (status != G_IO_STATUS_NORMAL) { - if (error) { - g_warning ("zenity_text_handle_stdin () : %s", error->message); - g_error_free (error); - error = NULL; - } - continue; + if (status != G_IO_STATUS_NORMAL) { + if (error) { + g_warning ("zenity_text_handle_stdin () : %s", error->message); + g_error_free (error); + error = NULL; } + return FALSE; + } - if (len > 0) { - GtkTextIter end; - gchar *utftext; - gsize localelen; - gsize utflen; + if (len > 0) { + GtkTextIter end; + gchar *utftext; + gsize localelen; + gsize utflen; - gtk_text_buffer_get_end_iter (buffer, &end); - utftext = g_convert_with_fallback (buf, len, "UTF-8", "ISO-8859-1", NULL, &localelen, &utflen, NULL); - gtk_text_buffer_insert (buffer, &end, utftext, utflen); - g_free (utftext); - } - - } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); + gtk_text_buffer_get_end_iter (buffer, &end); + utftext = g_convert_with_fallback (buf, len, "UTF-8", "ISO-8859-1", NULL, &localelen, &utflen, NULL); + gtk_text_buffer_insert (buffer, &end, utftext, utflen); + g_free (utftext); + } } - if (condition != G_IO_IN) { - g_io_channel_shutdown (channel, TRUE, NULL); - return FALSE; - } return TRUE; }