Mercurial > pidgin.yaz
changeset 12149:4e46eeec4ace
[gaim-migrate @ 14450]
Fix SILC. I broke this earlier with the file transfer changes. I swear I was compiling SILC and Sametime. I've fixed it now. Sorry about this.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 Nov 2005 02:01:48 +0000 |
| parents | 2c65a3749ce1 |
| children | e91f3f06a435 |
| files | src/protocols/silc/ft.c src/protocols/silc/silc.c src/protocols/silc/silcgaim.h |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/silc/ft.c Sat Nov 19 01:53:28 2005 +0000 +++ b/src/protocols/silc/ft.c Sat Nov 19 02:01:48 2005 +0000 @@ -395,7 +395,7 @@ silc_free(clients); silc_free(nickname); - return xfer; + return xfer->xfer; } void silcgaim_ftp_send_file(GaimConnection *gc, const char *name, const char *file) @@ -406,7 +406,7 @@ /* Choose file to send */ if (file) - gaim_xfer_request_accepted(xfer->xfer, file); + gaim_xfer_request_accepted(xfer, file); else - gaim_xfer_request(xfer->xfer); + gaim_xfer_request(xfer); }
--- a/src/protocols/silc/silc.c Sat Nov 19 01:53:28 2005 +0000 +++ b/src/protocols/silc/silc.c Sat Nov 19 02:01:48 2005 +0000 @@ -1557,7 +1557,6 @@ NULL, /* roomlist_expand_category */ NULL, /* can_receive_file */ silcgaim_ftp_send_file, /* send_file */ - silcgaim_ftp_send_file, /* send_file */ silcgaim_ftp_new_xfer, /* new_xfer */ &silcgaim_wb_ops, /* whiteboard operations */ };
--- a/src/protocols/silc/silcgaim.h Sat Nov 19 01:53:28 2005 +0000 +++ b/src/protocols/silc/silcgaim.h Sat Nov 19 02:01:48 2005 +0000 @@ -109,6 +109,7 @@ char *silcgaim_status_text(GaimBuddy *b); gboolean silcgaim_ip_is_private(const char *ip); void silcgaim_ftp_send_file(GaimConnection *gc, const char *name, const char *file); +GaimXfer *silcgaim_ftp_new_xfer(GaimConnection *gc, const char *name); void silcgaim_ftp_request(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, SilcUInt32 session_id, const char *hostname, SilcUInt16 port);