← Back to branch summary

~micahg/ubuntu/natty/pidgin/2.7.9-2

« back to all changes in this revision

Viewing changes to libpurple/protocols/jabber/oob.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-11-05 19:44:21 UTC
  • mfrom: (62.1.1 maverick-security) (2.3.12 sid)
  • Revision ID: james.westby@ubuntu.com-20101105194421-8r8o4pzw2m5j4hiy
Tags: 1:2.7.5-1ubuntu1
Resync on Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/jabber/oob.c
185
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
189
        jabber_oob_xfer_recv_error(xfer, "404");
190
190
}
191
191
 
233
233
                purple_xfer_set_init_fnc(xfer,   jabber_oob_xfer_init);
234
234
                purple_xfer_set_end_fnc(xfer,    jabber_oob_xfer_end);
235
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
237
                purple_xfer_set_read_fnc(xfer,   jabber_oob_xfer_read);
238
238
                purple_xfer_set_start_fnc(xfer,  jabber_oob_xfer_start);
239
239