Mercurial > pidgin
comparison libpurple/protocols/msn/slp.c @ 24404:f18f37a62971
merge of '54ee2acb5f6ef92c29503315eb7c24bae221cd7b'
and '6f0bf9d5a17857431bb0efc78f6d591e25772ddd'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 13 Nov 2008 09:00:45 +0000 |
| parents | bceefbae1ca6 |
| children | e71c1fad229f |
comparison
equal
deleted
inserted
replaced
| 24400:9e0458c98b4c | 24404:f18f37a62971 |
|---|---|
| 95 | 95 |
| 96 send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", | 96 send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", |
| 97 content); | 97 content); |
| 98 | 98 |
| 99 g_free(content); | 99 g_free(content); |
| 100 msn_slplink_unleash(slpcall->slplink); | 100 msn_slplink_send_queued_slpmsgs(slpcall->slplink); |
| 101 } | 101 } |
| 102 | 102 |
| 103 void | 103 void |
| 104 msn_xfer_cancel(PurpleXfer *xfer) | 104 msn_xfer_cancel(PurpleXfer *xfer) |
| 105 { | 105 { |
| 124 | 124 |
| 125 send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", | 125 send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody", |
| 126 content); | 126 content); |
| 127 | 127 |
| 128 g_free(content); | 128 g_free(content); |
| 129 msn_slplink_unleash(slpcall->slplink); | 129 msn_slplink_send_queued_slpmsgs(slpcall->slplink); |
| 130 | 130 |
| 131 msn_slpcall_destroy(slpcall); | 131 msn_slpcall_destroy(slpcall); |
| 132 } | 132 } |
| 133 } | 133 } |
| 134 } | 134 } |