Mercurial > pidgin.yaz
changeset 11401:69b0378c79e0
[gaim-migrate @ 13636]
Whoops
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 01 Sep 2005 02:29:05 +0000 |
| parents | 62db025d3eb0 |
| children | 3b95804caea4 |
| files | src/protocols/oscar/aim.h src/protocols/oscar/ft.c src/protocols/oscar/oscar.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Thu Sep 01 02:22:03 2005 +0000 +++ b/src/protocols/oscar/aim.h Thu Sep 01 02:29:05 2005 +0000 @@ -917,7 +917,7 @@ /* 0x0008 */ faim_export int aim_im_warn(aim_session_t *sess, aim_conn_t *conn, const char *destsn, fu32_t flags); /* 0x000b */ faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const guchar *cookie, fu16_t code); /* 0x0014 */ faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, const char *sn, fu16_t type2); -faim_export void aim_im_makecookie(guchar* cookie); +faim_export void aim_icbm_makecookie(guchar* cookie); /* ft.c */
--- a/src/protocols/oscar/ft.c Thu Sep 01 02:22:03 2005 +0000 +++ b/src/protocols/oscar/ft.c Thu Sep 01 02:29:05 2005 +0000 @@ -668,7 +668,7 @@ if (cookie) memcpy(new->cookie, cookie, 8); else - aim_im_makecookie(new->cookie); + aim_icbm_makecookie(new->cookie); if (ip) new->clientip = strdup(ip); else
--- a/src/protocols/oscar/oscar.c Thu Sep 01 02:22:03 2005 +0000 +++ b/src/protocols/oscar/oscar.c Thu Sep 01 02:29:05 2005 +0000 @@ -2661,7 +2661,7 @@ /* * Called by the Gaim core when the user indicates that a file is to be sent to - * a special someone. + * a special someone. */ static void oscar_send_file(GaimConnection *gc, const char *who, const char *file) { OscarData *od; @@ -2671,9 +2671,9 @@ gboolean use_rv_proxy; use_rv_proxy = gaim_prefs_get_bool("/plugins/prpl/oscar/use_rv_proxy"); - if(use_rv_proxy) + if(use_rv_proxy) gaim_debug_info("oscar","using stage 1 proxied transfer\n"); - + od = (OscarData *)gc->proto_data; /* You want to send a file to someone else, you're so generous */ @@ -2691,7 +2691,7 @@ oft_info->proxy_info = aim_rv_proxy_createinfo(oft_info->sess, NULL, 0); /* We must create a cookie before the request is sent * so that it can be sent to the proxy */ - aim_im_makecookie(oft_info->cookie); + aim_icbm_makecookie(oft_info->cookie); } else { ip = gaim_network_get_my_ip(od->conn ? od->conn->fd : -1); oft_info = aim_oft_createinfo(od->sess, NULL, who, ip, 0, 0, 0, NULL,