Mercurial > pidgin
comparison src/protocols/silc/ft.c @ 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 | cbebda5f019c |
| children | fd606401a8d2 |
comparison
equal
deleted
inserted
replaced
| 12148:2c65a3749ce1 | 12149:4e46eeec4ace |
|---|---|
| 393 xfer->xfer->data = xfer; | 393 xfer->xfer->data = xfer; |
| 394 | 394 |
| 395 silc_free(clients); | 395 silc_free(clients); |
| 396 silc_free(nickname); | 396 silc_free(nickname); |
| 397 | 397 |
| 398 return xfer; | 398 return xfer->xfer; |
| 399 } | 399 } |
| 400 | 400 |
| 401 void silcgaim_ftp_send_file(GaimConnection *gc, const char *name, const char *file) | 401 void silcgaim_ftp_send_file(GaimConnection *gc, const char *name, const char *file) |
| 402 { | 402 { |
| 403 GaimXfer *xfer = silcgaim_ftp_new_xfer(gc, name); | 403 GaimXfer *xfer = silcgaim_ftp_new_xfer(gc, name); |
| 404 | 404 |
| 405 g_return_if_fail(xfer != NULL); | 405 g_return_if_fail(xfer != NULL); |
| 406 | 406 |
| 407 /* Choose file to send */ | 407 /* Choose file to send */ |
| 408 if (file) | 408 if (file) |
| 409 gaim_xfer_request_accepted(xfer->xfer, file); | 409 gaim_xfer_request_accepted(xfer, file); |
| 410 else | 410 else |
| 411 gaim_xfer_request(xfer->xfer); | 411 gaim_xfer_request(xfer); |
| 412 } | 412 } |
