Mercurial > pidgin.yaz
changeset 24342:9bdaf273c0ff
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
few places.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 13 Nov 2008 08:26:12 +0000 |
| parents | b27908701f66 |
| children | 9e0458c98b4c bceefbae1ca6 |
| files | libpurple/protocols/msn/httpconn.c libpurple/protocols/msn/slp.c libpurple/protocols/msn/slpcall.c libpurple/protocols/msn/slpcall.h libpurple/protocols/msn/soap.c libpurple/protocols/msn/transaction.c |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/httpconn.c Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/httpconn.c Thu Nov 13 08:26:12 2008 +0000 @@ -720,7 +720,7 @@ httpconn->inpa = purple_input_add(httpconn->fd, PURPLE_INPUT_READ, read_cb, data); - httpconn->timer = purple_timeout_add(2000, msn_httpconn_poll, httpconn); + httpconn->timer = purple_timeout_add_seconds(2, msn_httpconn_poll, httpconn); msn_httpconn_process_queue(httpconn); }
--- a/libpurple/protocols/msn/slp.c Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/slp.c Thu Nov 13 08:26:12 2008 +0000 @@ -33,7 +33,7 @@ #include "smiley.h" /* ms to delay between sending buddy icon requests to the server. */ -#define BUDDY_ICON_DELAY 20000 +#define BUDDY_ICON_DELAY 20 /*debug SLP*/ #define MSN_DEBUG_UD @@ -1057,8 +1057,8 @@ purple_timeout_remove(userlist->buddy_icon_request_timer); } - /* Wait BUDDY_ICON_DELAY ms before freeing our window slot and requesting the next icon. */ - userlist->buddy_icon_request_timer = purple_timeout_add(BUDDY_ICON_DELAY, + /* Wait BUDDY_ICON_DELAY s before freeing our window slot and requesting the next icon. */ + userlist->buddy_icon_request_timer = purple_timeout_add_seconds(BUDDY_ICON_DELAY, msn_release_buddy_icon_request_timeout, userlist); }
--- a/libpurple/protocols/msn/slpcall.c Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/slpcall.c Thu Nov 13 08:26:12 2008 +0000 @@ -72,7 +72,7 @@ msn_slplink_add_slpcall(slplink, slpcall); - slpcall->timer = purple_timeout_add(MSN_SLPCALL_TIMEOUT, msn_slpcall_timeout, slpcall); + slpcall->timer = purple_timeout_add_seconds(MSN_SLPCALL_TIMEOUT, msn_slpcall_timeout, slpcall); return slpcall; }
--- a/libpurple/protocols/msn/slpcall.h Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/slpcall.h Thu Nov 13 08:26:12 2008 +0000 @@ -32,7 +32,7 @@ #include "slplink.h" /* The official client seems to timeout slp calls after 5 minutes */ -#define MSN_SLPCALL_TIMEOUT 300000 +#define MSN_SLPCALL_TIMEOUT 300 typedef enum {
--- a/libpurple/protocols/msn/soap.c Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/soap.c Thu Nov 13 08:26:12 2008 +0000 @@ -134,7 +134,7 @@ } if (session->soap_cleanup_handle == 0) - session->soap_cleanup_handle = purple_timeout_add(SOAP_TIMEOUT * 1000, + session->soap_cleanup_handle = purple_timeout_add_seconds(SOAP_TIMEOUT, msn_soap_cleanup_for_session, session); if (conn == NULL) {
--- a/libpurple/protocols/msn/transaction.c Thu Nov 13 08:01:36 2008 +0000 +++ b/libpurple/protocols/msn/transaction.c Thu Nov 13 08:26:12 2008 +0000 @@ -211,7 +211,7 @@ purple_timeout_remove(trans->timer); } trans->timeout_cb = cb; - trans->timer = purple_timeout_add(60000, transaction_timeout, trans); + trans->timer = purple_timeout_add_seconds(60, transaction_timeout, trans); } void