From: Mark D. <the...@us...> - 2005-10-31 04:27:22
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9691/src/protocols/oscar Modified Files: oscar.c Log Message: 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 Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.804 retrieving revision 1.805 diff -u -d -p -r1.804 -r1.805 --- oscar.c 30 Oct 2005 23:33:36 -0000 1.804 +++ oscar.c 31 Oct 2005 04:27:06 -0000 1.805 @@ -4524,7 +4524,7 @@ static int incomingim_chan4(aim_session_ 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 @@ static int gaim_parse_userinfo(aim_sessi 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); |