? help/zenity-C.omf
? help/zenity-es.omf
? help/zenity-fr.omf
? help/zenity-uk.omf
? help/es/.xml2po.mo
? help/es/zenity.xml
? help/fr/.xml2po.mo
? help/fr/zenity.xml
? help/uk/.xml2po.mo
? help/uk/zenity.xml
? po/stamp-it
Index: src/progress.c
===================================================================
RCS file: /cvs/gnome/zenity/src/progress.c,v
retrieving revision 1.24
diff -u -p -r1.24 progress.c
--- src/progress.c	15 Nov 2005 04:14:35 -0000	1.24
+++ src/progress.c	19 Dec 2005 11:39:29 -0000
@@ -229,14 +229,12 @@ zenity_progress_dialog_response (GtkWidg
       break;
 		
     case GTK_RESPONSE_CANCEL:
-      /* FIXME: This should kill off the parent process nicely and return an error code
-       * I'm pretty sure there is a nice way to do this, but I'm clueless about this
-       * stuff. Should be using SIGHUP instead of 1 though.
-       */
-      kill (getppid (), 1);
+      /* We do not want to kill the parent process, in order to give the user
+         the ability to choose the action to be taken. See bug #310824.
+      */
       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
       break;
-  
+
     default:
       /* Esc dialog */
       zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
