Mercurial > pidgin.yaz
comparison libpurple/protocols/irc/dcc_send.c @ 32827:4a34689eeb33 default tip
merged from im.pidgin.pidgin
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 19 Nov 2011 14:42:54 +0900 |
parents | 1f56d5102483 |
children |
comparison
equal
deleted
inserted
replaced
32692:0f94ec89f0bc | 32827:4a34689eeb33 |
---|---|
256 /* Let's print an error message anyway */ | 256 /* Let's print an error message anyway */ |
257 purple_debug_warning("irc", "accept: %s\n", g_strerror(errno)); | 257 purple_debug_warning("irc", "accept: %s\n", g_strerror(errno)); |
258 return; | 258 return; |
259 } | 259 } |
260 | 260 |
261 purple_input_remove(xfer->watcher); | 261 purple_input_remove(purple_xfer_get_watcher(xfer)); |
262 xfer->watcher = 0; | 262 purple_xfer_set_watcher(xfer, 0); |
263 close(xd->fd); | 263 close(xd->fd); |
264 xd->fd = -1; | 264 xd->fd = -1; |
265 | 265 |
266 flags = fcntl(conn, F_GETFL); | 266 flags = fcntl(conn, F_GETFL); |
267 fcntl(conn, F_SETFL, flags | O_NONBLOCK); | 267 fcntl(conn, F_SETFL, flags | O_NONBLOCK); |
311 xd->fd = sock; | 311 xd->fd = sock; |
312 | 312 |
313 port = purple_network_get_port_from_fd(sock); | 313 port = purple_network_get_port_from_fd(sock); |
314 purple_debug_misc("irc", "port is %hu\n", port); | 314 purple_debug_misc("irc", "port is %hu\n", port); |
315 /* Monitor the listening socket */ | 315 /* Monitor the listening socket */ |
316 xfer->watcher = purple_input_add(sock, PURPLE_INPUT_READ, | 316 purple_xfer_set_watcher(xfer, purple_input_add(sock, PURPLE_INPUT_READ, |
317 irc_dccsend_send_connected, xfer); | 317 irc_dccsend_send_connected, xfer)); |
318 | 318 |
319 /* Send the intended recipient the DCC request */ | 319 /* Send the intended recipient the DCC request */ |
320 arg[0] = purple_xfer_get_remote_user(xfer); | 320 arg[0] = purple_xfer_get_remote_user(xfer); |
321 inet_aton(purple_network_get_my_ip(irc->fd), &addr); | 321 inet_aton(purple_network_get_my_ip(irc->fd), &addr); |
322 arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %" G_GSIZE_FORMAT "\001", | 322 arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %" G_GOFFSET_FORMAT "\001", |
323 purple_xfer_get_filename(xfer), ntohl(addr.s_addr), | 323 purple_xfer_get_filename(xfer), ntohl(addr.s_addr), |
324 port, purple_xfer_get_size(xfer)); | 324 port, purple_xfer_get_size(xfer)); |
325 | 325 |
326 irc_cmd_privmsg(purple_connection_get_protocol_data(gc), "msg", NULL, arg); | 326 irc_cmd_privmsg(purple_connection_get_protocol_data(gc), "msg", NULL, arg); |
327 g_free(tmp); | 327 g_free(tmp); |