Mercurial > pidgin.yaz
changeset 3666:ae72be911db5
[gaim-migrate @ 3795]
no alarm for win..
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Sun, 13 Oct 2002 16:37:33 +0000 |
| parents | 7cb6cf20ed7d |
| children | 11ab2a5f6677 |
| files | src/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);