correctly stdin input for text info dialog (Fixes bug #336736).
2006-07-27 Lucas Rocha <lucasr@gnome.org> * src/text.c (zenity_text_handle_stdin): correctly stdin input for text info dialog (Fixes bug #336736).
This commit is contained in:
parent
8af67dea6c
commit
e46814b46a
@ -1,3 +1,8 @@
|
||||
2006-07-27 Lucas Rocha <lucasr@gnome.org>
|
||||
|
||||
* src/text.c (zenity_text_handle_stdin): correctly stdin input for
|
||||
text info dialog (Fixes bug #336736).
|
||||
|
||||
2006-07-27 Lucas Rocha <lucasr@gnome.org>
|
||||
|
||||
* src/entry.c (zenity_entry): entry activation makes dialog
|
||||
|
13
src/text.c
13
src/text.c
@ -43,13 +43,12 @@ 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;
|
||||
|
||||
do {
|
||||
status = g_io_channel_read_chars (channel, buf, 1024, &len, &error);
|
||||
@ -65,7 +64,7 @@ zenity_text_handle_stdin (GIOChannel *channel,
|
||||
g_error_free (error);
|
||||
error = NULL;
|
||||
}
|
||||
continue;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (len > 0) {
|
||||
@ -79,14 +78,8 @@ zenity_text_handle_stdin (GIOChannel *channel,
|
||||
gtk_text_buffer_insert (buffer, &end, utftext, utflen);
|
||||
g_free (utftext);
|
||||
}
|
||||
|
||||
} while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
|
||||
}
|
||||
|
||||
if (condition != G_IO_IN) {
|
||||
g_io_channel_shutdown (channel, TRUE, NULL);
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user