Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/oob.c @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 21 Nov 2010 20:30:12 +0000 |
| parents | 1cdae196aac8 |
| children | ac88c8fc3f47 |
comparison
equal
deleted
inserted
replaced
| 31448:9a705087d64e | 31449:1c660ba17ba1 |
|---|---|
| 183 | 183 |
| 184 static void jabber_oob_xfer_recv_denied(PurpleXfer *xfer) { | 184 static void jabber_oob_xfer_recv_denied(PurpleXfer *xfer) { |
| 185 jabber_oob_xfer_recv_error(xfer, "406"); | 185 jabber_oob_xfer_recv_error(xfer, "406"); |
| 186 } | 186 } |
| 187 | 187 |
| 188 static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) { | 188 static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) { |
| 189 jabber_oob_xfer_recv_error(xfer, "404"); | 189 jabber_oob_xfer_recv_error(xfer, "404"); |
| 190 } | 190 } |
| 191 | 191 |
| 192 void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type, | 192 void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type, |
| 193 const char *id, xmlnode *querynode) { | 193 const char *id, xmlnode *querynode) { |
| 231 g_free(filename); | 231 g_free(filename); |
| 232 | 232 |
| 233 purple_xfer_set_init_fnc(xfer, jabber_oob_xfer_init); | 233 purple_xfer_set_init_fnc(xfer, jabber_oob_xfer_init); |
| 234 purple_xfer_set_end_fnc(xfer, jabber_oob_xfer_end); | 234 purple_xfer_set_end_fnc(xfer, jabber_oob_xfer_end); |
| 235 purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied); | 235 purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied); |
| 236 purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_canceled); | 236 purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_cancelled); |
| 237 purple_xfer_set_read_fnc(xfer, jabber_oob_xfer_read); | 237 purple_xfer_set_read_fnc(xfer, jabber_oob_xfer_read); |
| 238 purple_xfer_set_start_fnc(xfer, jabber_oob_xfer_start); | 238 purple_xfer_set_start_fnc(xfer, jabber_oob_xfer_start); |
| 239 | 239 |
| 240 js->oob_file_transfers = g_list_append(js->oob_file_transfers, xfer); | 240 js->oob_file_transfers = g_list_append(js->oob_file_transfers, xfer); |
| 241 | 241 |