Mercurial > pidgin
comparison libpurple/protocols/msn/slpmsg.c @ 24390:c6c714b7841d
Get rid of slplink->local_user because it's a copy of
msn_user_get_passport(session->user), which is the same as account->username,
which is stupid
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 13 Nov 2008 06:18:53 +0000 |
parents | 4de9cd2a4af2 |
children | 35b6fd563056 |
comparison
equal
deleted
inserted
replaced
24389:2b62300d2c19 | 24390:c6c714b7841d |
---|---|
167 msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq, | 167 msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq, |
168 const char *header, const char *branch, | 168 const char *header, const char *branch, |
169 const char *content_type, const char *content) | 169 const char *content_type, const char *content) |
170 { | 170 { |
171 MsnSlpLink *slplink; | 171 MsnSlpLink *slplink; |
172 PurpleAccount *account; | |
172 MsnSlpMessage *slpmsg; | 173 MsnSlpMessage *slpmsg; |
173 char *body; | 174 char *body; |
174 gsize body_len; | 175 gsize body_len; |
175 gsize content_len; | 176 gsize content_len; |
176 | 177 |
177 g_return_val_if_fail(slpcall != NULL, NULL); | 178 g_return_val_if_fail(slpcall != NULL, NULL); |
178 g_return_val_if_fail(header != NULL, NULL); | 179 g_return_val_if_fail(header != NULL, NULL); |
179 | 180 |
180 slplink = slpcall->slplink; | 181 slplink = slpcall->slplink; |
182 account = slplink->session->account; | |
181 | 183 |
182 /* Let's remember that "content" should end with a 0x00 */ | 184 /* Let's remember that "content" should end with a 0x00 */ |
183 | 185 |
184 content_len = (content != NULL) ? strlen(content) + 1 : 0; | 186 content_len = (content != NULL) ? strlen(content) + 1 : 0; |
185 | 187 |
194 "Content-Type: %s\r\n" | 196 "Content-Type: %s\r\n" |
195 "Content-Length: %" G_GSIZE_FORMAT "\r\n" | 197 "Content-Length: %" G_GSIZE_FORMAT "\r\n" |
196 "\r\n", | 198 "\r\n", |
197 header, | 199 header, |
198 slplink->remote_user, | 200 slplink->remote_user, |
199 slplink->local_user, | 201 purple_account_get_username(account), |
200 branch, | 202 branch, |
201 cseq, | 203 cseq, |
202 slpcall->id, | 204 slpcall->id, |
203 content_type, | 205 content_type, |
204 content_len); | 206 content_len); |