← 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/si.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-12-02 16:45:52 UTC
  • mfrom: (2.3.14 sid)
  • Revision ID: james.westby@ubuntu.com-20101202164552-z64wykojzacbb546
Tags: 1:2.7.7-1ubuntu1
New upstream version, drop msn workaround

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/jabber/si.c
983
983
jabber_si_xfer_ibb_error_cb(JabberIBBSession *sess)
984
984
{
985
985
        PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
986
 
        JabberStream *js = jabber_ibb_session_get_js(sess);
987
 
        PurpleConnection *gc = js->gc;
988
 
        PurpleAccount *account = purple_connection_get_account(gc);
989
986
 
990
987
        purple_debug_error("jabber", "an error occurred during IBB file transfer\n");
991
 
        purple_xfer_error(purple_xfer_get_type(xfer), account,
992
 
                jabber_ibb_session_get_who(sess),
993
 
                        _("An error occurred on the in-band bytestream transfer\n"));
994
988
        purple_xfer_cancel_remote(xfer);
995
989
}
996
990
 
998
992
jabber_si_xfer_ibb_closed_cb(JabberIBBSession *sess)
999
993
{
1000
994
        PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
1001
 
        JabberStream *js = jabber_ibb_session_get_js(sess);
1002
 
        PurpleConnection *gc = js->gc;
1003
 
        PurpleAccount *account = purple_connection_get_account(gc);
1004
995
 
1005
996
        purple_debug_info("jabber", "the remote user closed the transfer\n");
1006
997
        if (purple_xfer_get_bytes_remaining(xfer) > 0) {
1007
 
                purple_xfer_error(purple_xfer_get_type(xfer), account,
1008
 
                        jabber_ibb_session_get_who(sess), _("Transfer was closed."));
1009
998
                purple_xfer_cancel_remote(xfer);
1010
999
        } else {
1011
1000
                purple_xfer_set_completed(xfer, TRUE);
1137
1126
jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
1138
1127
{
1139
1128
        PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
1140
 
        JabberStream *js = jabber_ibb_session_get_js(sess);
1141
 
        PurpleConnection *gc = js->gc;
1142
 
        PurpleAccount *account = purple_connection_get_account(gc);
1143
1129
 
1144
1130
        if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
1145
1131
                purple_xfer_start(xfer, -1, NULL, 0);
1146
1132
                purple_xfer_prpl_ready(xfer);
1147
1133
        } else {
1148
1134
                /* error */
1149
 
                purple_xfer_error(purple_xfer_get_type(xfer), account,
1150
 
                        jabber_ibb_session_get_who(sess),
1151
 
                        _("Failed to open in-band bytestream"));
1152
1135
                purple_xfer_end(xfer);
1153
1136
        }
1154
1137
}