Fix from owen so that the preview process will die properly on 2.2 kernels

when you exit the theme-selector-capplet

Dr Mike <drmike@redhat.com>
This commit is contained in:
Michael Fulbright 1999-03-19 05:34:00 +00:00
parent 16e9b02246
commit 44d961a2fd
2 changed files with 6 additions and 4 deletions

View file

@ -27,7 +27,8 @@ demo_data_in(gpointer data, gint source, GdkInputCondition condition)
{ {
gchar buf[256]; gchar buf[256];
if (read(source, buf, 2) == 0) if (condition & GDK_INPUT_EXCEPTION ||
read(source, buf, 2) == 0)
gtk_main_quit(); /* Parent exited */ gtk_main_quit(); /* Parent exited */
else { else {
if (gtk_rc_reparse_all ()) if (gtk_rc_reparse_all ())
@ -155,7 +156,7 @@ demo_main(int argc, char **argv, gint in_fd)
gtk_container_add (GTK_CONTAINER (scrolled_window), widget); gtk_container_add (GTK_CONTAINER (scrolled_window), widget);
gdk_input_add_full(in_fd, GDK_INPUT_READ, demo_data_in, NULL, NULL); gdk_input_add_full(in_fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, demo_data_in, NULL, NULL);
gtk_widget_show_all (plug); gtk_widget_show_all (plug);
gtk_main (); gtk_main ();

View file

@ -27,7 +27,8 @@ demo_data_in(gpointer data, gint source, GdkInputCondition condition)
{ {
gchar buf[256]; gchar buf[256];
if (read(source, buf, 2) == 0) if (condition & GDK_INPUT_EXCEPTION ||
read(source, buf, 2) == 0)
gtk_main_quit(); /* Parent exited */ gtk_main_quit(); /* Parent exited */
else { else {
if (gtk_rc_reparse_all ()) if (gtk_rc_reparse_all ())
@ -155,7 +156,7 @@ demo_main(int argc, char **argv, gint in_fd)
gtk_container_add (GTK_CONTAINER (scrolled_window), widget); gtk_container_add (GTK_CONTAINER (scrolled_window), widget);
gdk_input_add_full(in_fd, GDK_INPUT_READ, demo_data_in, NULL, NULL); gdk_input_add_full(in_fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, demo_data_in, NULL, NULL);
gtk_widget_show_all (plug); gtk_widget_show_all (plug);
gtk_main (); gtk_main ();