Mercurial > pidgin.yaz
diff libpurple/protocols/irc/dcc_send.c @ 15823:32c366eeeb99
sed -ie 's/gaim/purple/g'
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Mon, 19 Mar 2007 07:01:17 +0000 |
parents | 21bc8d84974f |
children | 44b4e8bd759b |
line wrap: on
line diff
--- a/libpurple/protocols/irc/dcc_send.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Mon Mar 19 07:01:17 2007 +0000 @@ -1,10 +1,10 @@ /** * @file dcc_send.c Functions used in sending files with DCC SEND * - * gaim + * purple * * Copyright (C) 2004, Timothy T Ringenbach <omarvo@hotmail.com> - * Copyright (C) 2003, Robbert Haarman <gaim@inglorion.net> + * Copyright (C) 2003, Robbert Haarman <purple@inglorion.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ gchar *ip; }; -static void irc_dccsend_recv_destroy(GaimXfer *xfer) +static void irc_dccsend_recv_destroy(PurpleXfer *xfer) { struct irc_xfer_rx_data *xd = xfer->data; @@ -51,24 +51,24 @@ * It sends the acknowledgement (in the form of a total byte count as an * unsigned 4 byte integer in network byte order) */ -static void irc_dccsend_recv_ack(GaimXfer *xfer, const guchar *data, size_t size) { +static void irc_dccsend_recv_ack(PurpleXfer *xfer, const guchar *data, size_t size) { unsigned long l; l = htonl(xfer->bytes_sent); write(xfer->fd, &l, sizeof(l)); } -static void irc_dccsend_recv_init(GaimXfer *xfer) { +static void irc_dccsend_recv_init(PurpleXfer *xfer) { struct irc_xfer_rx_data *xd = xfer->data; - gaim_xfer_start(xfer, -1, xd->ip, xfer->remote_port); + purple_xfer_start(xfer, -1, xd->ip, xfer->remote_port); g_free(xd->ip); xd->ip = NULL; } /* This function makes the necessary arrangements for receiving files */ void irc_dccsend_recv(struct irc_conn *irc, const char *from, const char *msg) { - GaimXfer *xfer; + PurpleXfer *xfer; struct irc_xfer_rx_data *xd; gchar **token; struct in_addr addr; @@ -107,13 +107,13 @@ } i++; - xfer = gaim_xfer_new(irc->account, GAIM_XFER_RECEIVE, from); + xfer = purple_xfer_new(irc->account, PURPLE_XFER_RECEIVE, from); if (xfer) { xd = g_new0(struct irc_xfer_rx_data, 1); xfer->data = xd; - gaim_xfer_set_filename(xfer, filename->str); + purple_xfer_set_filename(xfer, filename->str); xfer->remote_port = atoi(token[i+1]); nip = strtoul(token[i], NULL, 10); @@ -123,18 +123,18 @@ } else { xd->ip = g_strdup(token[i]); } - gaim_debug(GAIM_DEBUG_INFO, "irc", "Receiving file from %s\n", + purple_debug(PURPLE_DEBUG_INFO, "irc", "Receiving file from %s\n", xd->ip); - gaim_xfer_set_size(xfer, token[i+2] ? atoi(token[i+2]) : 0); + purple_xfer_set_size(xfer, token[i+2] ? atoi(token[i+2]) : 0); - gaim_xfer_set_init_fnc(xfer, irc_dccsend_recv_init); - gaim_xfer_set_ack_fnc(xfer, irc_dccsend_recv_ack); + purple_xfer_set_init_fnc(xfer, irc_dccsend_recv_init); + purple_xfer_set_ack_fnc(xfer, irc_dccsend_recv_ack); - gaim_xfer_set_end_fnc(xfer, irc_dccsend_recv_destroy); - gaim_xfer_set_request_denied_fnc(xfer, irc_dccsend_recv_destroy); - gaim_xfer_set_cancel_send_fnc(xfer, irc_dccsend_recv_destroy); + purple_xfer_set_end_fnc(xfer, irc_dccsend_recv_destroy); + purple_xfer_set_request_denied_fnc(xfer, irc_dccsend_recv_destroy); + purple_xfer_set_cancel_send_fnc(xfer, irc_dccsend_recv_destroy); - gaim_xfer_request(xfer); + purple_xfer_request(xfer); } g_strfreev(token); g_string_free(filename, TRUE); @@ -145,14 +145,14 @@ *******************************************************************/ struct irc_xfer_send_data { - GaimNetworkListenData *listen_data; + PurpleNetworkListenData *listen_data; gint inpa; int fd; guchar *rxqueue; guint rxlen; }; -static void irc_dccsend_send_destroy(GaimXfer *xfer) +static void irc_dccsend_send_destroy(PurpleXfer *xfer) { struct irc_xfer_send_data *xd = xfer->data; @@ -160,9 +160,9 @@ return; if (xd->listen_data != NULL) - gaim_network_listen_cancel(xd->listen_data); + purple_network_listen_cancel(xd->listen_data); if (xd->inpa > 0) - gaim_input_remove(xd->inpa); + purple_input_remove(xd->inpa); if (xd->fd != -1) close(xd->fd); @@ -173,9 +173,9 @@ } /* just in case you were wondering, this is why DCC is gay */ -static void irc_dccsend_send_read(gpointer data, int source, GaimInputCondition cond) +static void irc_dccsend_send_read(gpointer data, int source, PurpleInputCondition cond) { - GaimXfer *xfer = data; + PurpleXfer *xfer = data; struct irc_xfer_send_data *xd = xfer->data; char *buffer[16]; int len; @@ -186,7 +186,7 @@ return; else if (len <= 0) { /* XXX: Shouldn't this be canceling the transfer? */ - gaim_input_remove(xd->inpa); + purple_input_remove(xd->inpa); xd->inpa = 0; return; } @@ -213,22 +213,22 @@ xd->rxqueue = NULL; } - if (acked >= gaim_xfer_get_size(xfer)) { - gaim_input_remove(xd->inpa); + if (acked >= purple_xfer_get_size(xfer)) { + purple_input_remove(xd->inpa); xd->inpa = 0; - gaim_xfer_set_completed(xfer, TRUE); - gaim_xfer_end(xfer); + purple_xfer_set_completed(xfer, TRUE); + purple_xfer_end(xfer); return; } } } -static gssize irc_dccsend_send_write(const guchar *buffer, size_t size, GaimXfer *xfer) +static gssize irc_dccsend_send_write(const guchar *buffer, size_t size, PurpleXfer *xfer) { gssize s; int ret; - s = MIN(gaim_xfer_get_bytes_remaining(xfer), size); + s = MIN(purple_xfer_get_bytes_remaining(xfer), size); if (!s) return 0; @@ -240,8 +240,8 @@ return ret; } -static void irc_dccsend_send_connected(gpointer data, int source, GaimInputCondition cond) { - GaimXfer *xfer = (GaimXfer *) data; +static void irc_dccsend_send_connected(gpointer data, int source, PurpleInputCondition cond) { + PurpleXfer *xfer = (PurpleXfer *) data; struct irc_xfer_send_data *xd = xfer->data; int conn; @@ -251,26 +251,26 @@ * to the nonblocking nature of the listening socket, so we'll * just try again next time */ /* Let's print an error message anyway */ - gaim_debug_warning("irc", "accept: %s\n", strerror(errno)); + purple_debug_warning("irc", "accept: %s\n", strerror(errno)); return; } - gaim_input_remove(xfer->watcher); + purple_input_remove(xfer->watcher); xfer->watcher = 0; close(xd->fd); xd->fd = -1; - xd->inpa = gaim_input_add(conn, GAIM_INPUT_READ, irc_dccsend_send_read, xfer); + xd->inpa = purple_input_add(conn, PURPLE_INPUT_READ, irc_dccsend_send_read, xfer); /* Start the transfer */ - gaim_xfer_start(xfer, conn, NULL, 0); + purple_xfer_start(xfer, conn, NULL, 0); } static void irc_dccsend_network_listen_cb(int sock, gpointer data) { - GaimXfer *xfer = data; + PurpleXfer *xfer = data; struct irc_xfer_send_data *xd; - GaimConnection *gc; + PurpleConnection *gc; struct irc_conn *irc; const char *arg[2]; char *tmp; @@ -280,36 +280,36 @@ xd = xfer->data; xd->listen_data = NULL; - if (gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_CANCEL_LOCAL - || gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_CANCEL_REMOTE) { - gaim_xfer_unref(xfer); + if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL + || purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_REMOTE) { + purple_xfer_unref(xfer); return; } xd = xfer->data; - gc = gaim_account_get_connection(gaim_xfer_get_account(xfer)); + gc = purple_account_get_connection(purple_xfer_get_account(xfer)); irc = gc->proto_data; - gaim_xfer_unref(xfer); + purple_xfer_unref(xfer); if (sock < 0) { - gaim_notify_error(gc, NULL, _("File Transfer Failed"), + purple_notify_error(gc, NULL, _("File Transfer Failed"), _("Could not open a listening port.")); - gaim_xfer_cancel_local(xfer); + purple_xfer_cancel_local(xfer); return; } xd->fd = sock; - port = gaim_network_get_port_from_fd(sock); - gaim_debug_misc("irc", "port is %hu\n", port); + port = purple_network_get_port_from_fd(sock); + purple_debug_misc("irc", "port is %hu\n", port); /* Monitor the listening socket */ - xfer->watcher = gaim_input_add(sock, GAIM_INPUT_READ, + xfer->watcher = purple_input_add(sock, PURPLE_INPUT_READ, irc_dccsend_send_connected, xfer); /* Send the intended recipient the DCC request */ arg[0] = xfer->who; - inet_aton(gaim_network_get_my_ip(irc->fd), &addr); + inet_aton(purple_network_get_my_ip(irc->fd), &addr); arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %" G_GSIZE_FORMAT "\001", xfer->filename, ntohl(addr.s_addr), port, xfer->size); @@ -321,32 +321,32 @@ /* * This function is called after the user has selected a file to send. */ -static void irc_dccsend_send_init(GaimXfer *xfer) { - GaimConnection *gc = gaim_account_get_connection(gaim_xfer_get_account(xfer)); +static void irc_dccsend_send_init(PurpleXfer *xfer) { + PurpleConnection *gc = purple_account_get_connection(purple_xfer_get_account(xfer)); struct irc_xfer_send_data *xd = xfer->data; xfer->filename = g_path_get_basename(xfer->local_filename); - gaim_xfer_ref(xfer); + purple_xfer_ref(xfer); /* Create a listening socket */ - xd->listen_data = gaim_network_listen_range(0, 0, SOCK_STREAM, + xd->listen_data = purple_network_listen_range(0, 0, SOCK_STREAM, irc_dccsend_network_listen_cb, xfer); if (xd->listen_data == NULL) { - gaim_xfer_unref(xfer); - gaim_notify_error(gc, NULL, _("File Transfer Failed"), + purple_xfer_unref(xfer); + purple_notify_error(gc, NULL, _("File Transfer Failed"), _("Could not open a listening port.")); - gaim_xfer_cancel_local(xfer); + purple_xfer_cancel_local(xfer); } } -GaimXfer *irc_dccsend_new_xfer(GaimConnection *gc, const char *who) { - GaimXfer *xfer; +PurpleXfer *irc_dccsend_new_xfer(PurpleConnection *gc, const char *who) { + PurpleXfer *xfer; struct irc_xfer_send_data *xd; /* Build the file transfer handle */ - xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, who); + xfer = purple_xfer_new(purple_connection_get_account(gc), PURPLE_XFER_SEND, who); if (xfer) { xd = g_new0(struct irc_xfer_send_data, 1); @@ -354,27 +354,27 @@ xfer->data = xd; /* Setup our I/O op functions */ - gaim_xfer_set_init_fnc(xfer, irc_dccsend_send_init); - gaim_xfer_set_write_fnc(xfer, irc_dccsend_send_write); - gaim_xfer_set_end_fnc(xfer, irc_dccsend_send_destroy); - gaim_xfer_set_request_denied_fnc(xfer, irc_dccsend_send_destroy); - gaim_xfer_set_cancel_send_fnc(xfer, irc_dccsend_send_destroy); + purple_xfer_set_init_fnc(xfer, irc_dccsend_send_init); + purple_xfer_set_write_fnc(xfer, irc_dccsend_send_write); + purple_xfer_set_end_fnc(xfer, irc_dccsend_send_destroy); + purple_xfer_set_request_denied_fnc(xfer, irc_dccsend_send_destroy); + purple_xfer_set_cancel_send_fnc(xfer, irc_dccsend_send_destroy); } return xfer; } /** - * Gaim calls this function when the user selects Send File from the + * Purple calls this function when the user selects Send File from the * buddy menu - * It sets up the GaimXfer struct and tells Gaim to go ahead + * It sets up the PurpleXfer struct and tells Purple to go ahead */ -void irc_dccsend_send_file(GaimConnection *gc, const char *who, const char *file) { - GaimXfer *xfer = irc_dccsend_new_xfer(gc, who); +void irc_dccsend_send_file(PurpleConnection *gc, const char *who, const char *file) { + PurpleXfer *xfer = irc_dccsend_new_xfer(gc, who); /* Perform the request */ if (file) - gaim_xfer_request_accepted(xfer, file); + purple_xfer_request_accepted(xfer, file); else - gaim_xfer_request(xfer); + purple_xfer_request(xfer); }