# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1034527053 0
# Node ID ae72be911db5223fc2b5dc45cde36deccdf28f8d
# Parent  7cb6cf20ed7d2e79dd86d35beece7347f3be0dfb
[gaim-migrate @ 3795]
no alarm for win..

committer: Tailor Script <tailor@pidgin.im>

diff -r 7cb6cf20ed7d -r ae72be911db5 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sun Oct 13 16:35:14 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Sun Oct 13 16:37:33 2002 +0000
@@ -55,6 +55,7 @@
 
 #ifdef _WIN32
 #include "win32dep.h"
+#define NOSIGALARM
 #endif
 
 #include "pixmaps/protocols/oscar/ab.xpm"
@@ -1512,8 +1513,9 @@
 	struct oscar_file_transfer *oft;
 	va_list ap;
 	aim_conn_t *conn, *listenerconn;
-
+#ifndef NOSIGALARM
 	alarm(0); /* reset timeout alarm */
+#endif
 	va_start(ap, fr);
 	conn = va_arg(ap, aim_conn_t *);
 	listenerconn = va_arg(ap, aim_conn_t *);
@@ -1588,7 +1590,7 @@
 				GAIM_ERROR);
 		return;
 	}
-
+#ifndef NOSIGALARM
 	{
 		/* XXX is there a good glib-oriented way of doing this?
 		 * -- wtm */
@@ -1599,7 +1601,7 @@
 		sigaction(SIGALRM, &act, NULL);
 		alarm(OFT_TIMEOUT);
 	}
-
+#endif
 	aim_conn_addhandler(od->sess, oft->conn, AIM_CB_FAM_OFT,
 			AIM_CB_OFT_GETFILEINITIATE,
 			oscar_sendfile_accepted,
@@ -2189,7 +2191,9 @@
 			if (oft) {
 				buf = g_strdup_printf(_("%s has declined to receive a file from %s.\n"),
 						who, gc->username);
+#ifndef NOSIGALARM
 				alarm(0); /* reset timeout alarm */
+#endif
 				oft_listening = NULL;
 				transfer_abort(oft->xfer, buf);
 				g_free(buf);