Mercurial > pidgin
comparison libpurple/protocols/msnp9/slp.c @ 25576:7f552614ec8a
applied changes from a336cc1fd3a1ce815f97303b8d5ae8988f8cbd5b
through fe4f5d91d1605cf93c53470e59d4bf8da6c5c840
ChangeLog for the above.
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Tue, 28 Apr 2009 20:57:59 +0000 |
parents | 981a0bfc3d9d |
children | db99cde1845c |
comparison
equal
deleted
inserted
replaced
25575:d51b8647d43c | 25576:7f552614ec8a |
---|---|
31 #include "user.h" | 31 #include "user.h" |
32 #include "switchboard.h" | 32 #include "switchboard.h" |
33 | 33 |
34 #include "smiley.h" | 34 #include "smiley.h" |
35 | 35 |
36 /* ms to delay between sending buddy icon requests to the server. */ | 36 /* Seconds to delay between sending buddy icon requests to the server. */ |
37 #define BUDDY_ICON_DELAY 20000 | 37 #define BUDDY_ICON_DELAY 20 |
38 | 38 |
39 static void send_ok(MsnSlpCall *slpcall, const char *branch, | 39 static void send_ok(MsnSlpCall *slpcall, const char *branch, |
40 const char *type, const char *content); | 40 const char *type, const char *content); |
41 | 41 |
42 static void send_decline(MsnSlpCall *slpcall, const char *branch, | 42 static void send_decline(MsnSlpCall *slpcall, const char *branch, |
1056 | 1056 |
1057 /* Clear our pending timeout */ | 1057 /* Clear our pending timeout */ |
1058 purple_timeout_remove(userlist->buddy_icon_request_timer); | 1058 purple_timeout_remove(userlist->buddy_icon_request_timer); |
1059 } | 1059 } |
1060 | 1060 |
1061 /* Wait BUDDY_ICON_DELAY ms before freeing our window slot and requesting the next icon. */ | 1061 /* Wait BUDDY_ICON_DELAY_S seconds before freeing our window slot and requesting the next icon. */ |
1062 userlist->buddy_icon_request_timer = purple_timeout_add(BUDDY_ICON_DELAY, | 1062 userlist->buddy_icon_request_timer = purple_timeout_add_seconds(BUDDY_ICON_DELAY, |
1063 msn_release_buddy_icon_request_timeout, userlist); | 1063 msn_release_buddy_icon_request_timeout, userlist); |
1064 } | 1064 } |
1065 | 1065 |
1066 void | 1066 void |
1067 msn_request_user_display(MsnUser *user) | 1067 msn_request_user_display(MsnUser *user) |