Mercurial > pidgin.yaz
comparison src/protocols/msn/switchboard.c @ 9451:7b56b8ba3dff
[gaim-migrate @ 10275]
This fixes bug 984612, which is a duplicate of some other bug.
It html escapes msn friendly names so they don't contain html or
invalid markup, and not display all the way in "foo closed the conversation
window" type messages.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Mon, 05 Jul 2004 19:11:09 +0000 |
parents | 997c28571364 |
children | b6feee45f33d |
comparison
equal
deleted
inserted
replaced
9450:a41f3b685de9 | 9451:7b56b8ba3dff |
---|---|
172 { | 172 { |
173 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(swboard->conv), user, NULL); | 173 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(swboard->conv), user, NULL); |
174 } | 174 } |
175 else | 175 else |
176 { | 176 { |
177 const char *username; | 177 char *username; |
178 GaimConversation *conv; | 178 GaimConversation *conv; |
179 GaimBuddy *b; | 179 GaimBuddy *b; |
180 char *str = NULL; | 180 char *str = NULL; |
181 | 181 |
182 if ((b = gaim_find_buddy(account, user)) != NULL) | 182 if ((b = gaim_find_buddy(account, user)) != NULL) |
183 username = gaim_get_buddy_alias(b); | 183 username = gaim_escape_html(gaim_get_buddy_alias(b)); |
184 else | 184 else |
185 username = user; | 185 username = gaim_escape_html(user); |
186 | 186 |
187 if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1) | 187 if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1) |
188 { | 188 { |
189 if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice")) | 189 if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice")) |
190 { | 190 { |
209 | 209 |
210 g_free(str); | 210 g_free(str); |
211 } | 211 } |
212 | 212 |
213 msn_switchboard_disconnect(swboard); | 213 msn_switchboard_disconnect(swboard); |
214 g_free(username); | |
214 } | 215 } |
215 } | 216 } |
216 | 217 |
217 static void | 218 static void |
218 iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 219 iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |