changeset 43:36e2868ce8b7

2002-10-30 Brian Masney <masneyb@gftp.org> * src/gtk/transfer.c (getdir_thread) - set use_jmp_environment to 0 instead of 1 * src/gtk/misc-gtk.c (signal_handler) - if use_jmp_environment is 0, and SIGINT is received, terminate the program
author masneyb
date Wed, 30 Oct 2002 22:34:15 +0000
parents cd169e4789df
children 9c0825c047e7
files ChangeLog src/gtk/misc-gtk.c src/gtk/transfer.c
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 30 03:34:37 2002 +0000
+++ b/ChangeLog	Wed Oct 30 22:34:15 2002 +0000
@@ -1,3 +1,9 @@
+2002-10-30 Brian Masney <masneyb@gftp.org>
+	* src/gtk/transfer.c (getdir_thread) - set use_jmp_environment to 0		instead of 1
+
+	* src/gtk/misc-gtk.c (signal_handler) - if use_jmp_environment is 0,
+	and SIGINT is received, terminate the program
+
 2002-10-29 Brian Masney <masneyb@gftp.org>
 	* src/gtk/chmod_dialog.c src/gtk/delete_dialog.c src/gtk/gftp-gtk.c 
 	src/gtk/gftp-gtk.h src/gtk/menu-items.c src/gtk/misc-gtk.c 
@@ -103,7 +109,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.21 2002/10/30 03:34:35 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.22 2002/10/30 22:34:14 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/src/gtk/misc-gtk.c	Wed Oct 30 03:34:37 2002 +0000
+++ b/src/gtk/misc-gtk.c	Wed Oct 30 22:34:15 2002 +0000
@@ -1229,6 +1229,8 @@
 
   if (use_jmp_environment)
     siglongjmp (jmp_environment, signo == SIGINT ? 1 : 2);
+  else if (signo == SIGINT)
+    exit (1);
 }
 
 
--- a/src/gtk/transfer.c	Wed Oct 30 03:34:37 2002 +0000
+++ b/src/gtk/transfer.c	Wed Oct 30 22:34:15 2002 +0000
@@ -205,7 +205,7 @@
 
   request->user_data = NULL;
   if (request->use_threads)
-    use_jmp_environment = 1;
+    use_jmp_environment = 0;
 
   request->stopable = 0;
   if (request->wakeup_main_thread[1] > 0)