From bc2f701c5a366a435536a89ac62f2852c8cedc1e Mon Sep 17 00:00:00 2001
From: jim <jim@FreeBSD.org>
Date: Sun, 25 Nov 2001 01:00:05 +0000
Subject: Add two patches -- one fixes dccs autoresume, and the other fixes
 xchat when used with bnc.

Prodded by:	David Hill <david@phobia.ms>
Obtained from:	xchat.org
---
 irc/xchat1/files/patch-autoresume | 17 +++++++++++++++
 irc/xchat1/files/patch-bnc        | 46 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 irc/xchat1/files/patch-autoresume
 create mode 100644 irc/xchat1/files/patch-bnc

(limited to 'irc/xchat1')

diff --git a/irc/xchat1/files/patch-autoresume b/irc/xchat1/files/patch-autoresume
new file mode 100644
index 000000000000..fa01aaddf088
--- /dev/null
+++ b/irc/xchat1/files/patch-autoresume
@@ -0,0 +1,17 @@
+--- src/common/dcc.c.orig	Fri Oct 12 08:13:04 2001
++++ src/common/dcc.c	Sat Nov 24 16:47:39 2001
+@@ -1292,8 +1292,12 @@
+ 					while (list)
+ 					{
+ 						d = list->data;
+-						if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
+-							goto dontresume;
++						if (d->type == TYPE_RECV && d->dccstat != STAT_ABORTED &&
++							 d->dccstat != STAT_DONE && d->dccstat != STAT_FAILED)
++						{
++							if (d != dcc && strcmp (d->destfile, dcc->destfile) == 0)
++								goto dontresume;
++						}
+ 						list = list->next;
+ 					}
+ 					dcc_resume (dcc);
diff --git a/irc/xchat1/files/patch-bnc b/irc/xchat1/files/patch-bnc
new file mode 100644
index 000000000000..17bff4c687b8
--- /dev/null
+++ b/irc/xchat1/files/patch-bnc
@@ -0,0 +1,46 @@
+--- src/common/xchat.c.orig	Sun Oct 14 07:46:36 2001
++++ src/common/xchat.c	Sat Nov 24 16:48:41 2001
+@@ -69,6 +69,7 @@
+ GSList *urlhandler_list = 0;
+ static GSList *away_list = 0;
+ 
++static int in_xchat_exit = FALSE;
+ int xchat_is_quitting = FALSE;
+ int auto_connect = TRUE;
+ 
+@@ -730,7 +731,7 @@
+ 	free (killsess->current_modes);
+ 	free (killsess);
+ 
+-	if (!sess_list && !xchat_is_quitting)
++	if (!sess_list && !in_xchat_exit)
+ 		xchat_exit ();						/* sess_list is empty, quit! */
+ 
+ 	list = sess_list;
+@@ -1051,6 +1052,7 @@
+ xchat_exit (void)
+ {
+ 	xchat_is_quitting = TRUE;
++	in_xchat_exit = TRUE;
+ #ifdef USE_PERL
+ 	perl_end ();
+ #endif
+
+--- src/fe-gtk/maingui.c.orig	Thu Oct 25 00:19:29 2001
++++ src/fe-gtk/maingui.c	Sat Nov 24 16:48:41 2001
+@@ -923,7 +923,6 @@
+ static void
+ gui_main_window_kill (gpointer userdata)
+ {
+-#if 0
+ 	GSList *list;
+ 	session *sess;
+ 
+@@ -941,7 +940,6 @@
+ 		}
+ 		list = list->next;
+ 	}
+-#endif
+ 
+ 	main_window = 0;
+ 	current_tab = 0;
-- 
cgit