Mercurial > pidgin.yaz
comparison src/protocols/oscar/oscar.c @ 8838:518455386538
[gaim-migrate @ 9604]
-Fix the compile error in perl that was my fault
-Rename a network.c function and change it's signature (is that work
applicable in c?)
-Make rendezvous crash when trying to sign on
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 28 Apr 2004 03:16:40 +0000 |
parents | 9693c881ac78 |
children | 60cc86a15eed |
comparison
equal
deleted
inserted
replaced
8837:25206a0fb4e4 | 8838:518455386538 |
---|---|
1275 } | 1275 } |
1276 } | 1276 } |
1277 | 1277 |
1278 static void oscar_ask_sendfile(GaimConnection *gc, const char *destsn) { | 1278 static void oscar_ask_sendfile(GaimConnection *gc, const char *destsn) { |
1279 OscarData *od = (OscarData *)gc->proto_data; | 1279 OscarData *od = (OscarData *)gc->proto_data; |
1280 GaimAccount *account = gaim_connection_get_account(gc); | |
1281 GaimXfer *xfer; | 1280 GaimXfer *xfer; |
1282 struct aim_oft_info *oft_info; | 1281 struct aim_oft_info *oft_info; |
1283 const char *ip; | 1282 const char *ip; |
1284 | 1283 |
1285 /* You want to send a file to someone else, you're so generous */ | 1284 /* You want to send a file to someone else, you're so generous */ |
1286 | 1285 |
1287 /* Build the file transfer handle */ | 1286 /* Build the file transfer handle */ |
1288 xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, destsn); | 1287 xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, destsn); |
1289 | 1288 |
1290 /* Create the oscar-specific data */ | 1289 /* Create the oscar-specific data */ |
1291 ip = gaim_network_get_ip_for_account(account, od->conn ? od->conn->fd : -1); | 1290 ip = gaim_network_get_my_ip(od->conn ? od->conn->fd : -1); |
1292 oft_info = aim_oft_createinfo(od->sess, NULL, destsn, ip, 0, 0, 0, NULL); | 1291 oft_info = aim_oft_createinfo(od->sess, NULL, destsn, ip, 0, 0, 0, NULL); |
1293 xfer->data = oft_info; | 1292 xfer->data = oft_info; |
1294 | 1293 |
1295 /* Setup our I/O op functions */ | 1294 /* Setup our I/O op functions */ |
1296 gaim_xfer_set_init_fnc(xfer, oscar_xfer_init_send); | 1295 gaim_xfer_set_init_fnc(xfer, oscar_xfer_init_send); |