Mercurial > pidgin
diff src/protocols/oscar/oscar.c @ 11920:52f27ffe68a5
[gaim-migrate @ 14211]
sf patch #1339035, from Sadrul Habib Chowdhury
"Remove the \n in Yahoo! status messages when showing them in the buddy
list inline."
Also some changes from me. I changed gaim_str_strip_cr(char *text) to
gaim_str_strip_char(char *text, char thechar). I don't know why, really,
but it seems like it could be more useful this way. Eh
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 31 Oct 2005 04:27:06 +0000 |
| parents | 700ec4523c04 |
| children | bcdc6eba1700 |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Mon Oct 31 03:55:56 2005 +0000 +++ b/src/protocols/oscar/oscar.c Mon Oct 31 04:27:06 2005 +0000 @@ -4524,7 +4524,7 @@ for (numtoks=0; msg1[numtoks]; numtoks++); msg2 = (gchar **)g_malloc((numtoks+1)*sizeof(gchar *)); for (i=0; msg1[i]; i++) { - gaim_str_strip_cr(msg1[i]); + gaim_str_strip_char(msg1[i], '\r'); msg2[i] = gaim_plugin_oscar_decode_im_part(account, "1", AIM_CHARSET_ASCII, 0x0000, msg1[i], strlen(msg1[i])); } msg2[i] = NULL; @@ -5089,7 +5089,7 @@ tmp = gaim_str_sub_away_formatters(str->str, gaim_account_get_username(account)); g_string_free(str, TRUE); - gaim_str_strip_cr(tmp); + gaim_str_strip_char(tmp, '\r'); gaim_notify_userinfo(gc, userinfo->sn, tmp, NULL, NULL); g_free(tmp);