file-roller r2312 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Jun 10 09:00:52 2008
New Revision: 2312
URL: http://svn.gnome.org/viewvc/file-roller?rev=2312&view=rev

Log:
2008-06-10  Paolo Bacchilega  <paobac svn gnome org>

	* src/main.c (initialize_data): 
	* src/fr-process.c (_fr_process_stop): 

	stop the process calling 'kill' on all the processes in the group, and 
	capture the SIGTERM signal to not terminate the main process.
	
	Fixes bug #520844 â File roller not cancelling compression

Modified:
   trunk/ChangeLog
   trunk/src/fr-process.c
   trunk/src/main.c

Modified: trunk/src/fr-process.c
==============================================================================
--- trunk/src/fr-process.c	(original)
+++ trunk/src/fr-process.c	Tue Jun 10 09:00:52 2008
@@ -895,7 +895,7 @@
 		allow_sticky_processes_only (fr_proc, emit_signal);
 
 	else if (fr_proc->term_on_stop)
-		kill (fr_proc->command_pid, SIGTERM);
+		kill (0/*fr_proc->command_pid*/, SIGTERM);
 
 	else {
 		if (fr_proc->log_timeout != 0) {

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Jun 10 09:00:52 2008
@@ -22,6 +22,8 @@
 
 #include <config.h>
 #include <string.h>
+#include <sys/types.h>
+#include <signal.h>
 
 #include <gio/gio.h>
 #include <glade/glade.h>
@@ -304,8 +306,17 @@
 
 
 static void
+sig_int (int signo)
+{
+	signal (SIGTERM, sig_int);
+}
+
+
+static void
 initialize_data (void)
 {
+	signal (SIGTERM, sig_int);
+	
 	eel_gconf_monitor_add ("/apps/file-roller");
 	eel_gconf_monitor_add (PREF_NAUTILUS_CLICK_POLICY);