From: Mark D. <the...@us...> - 2004-07-31 23:09:10
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9191/protocols/oscar Modified Files: oscar.c Log Message: As far as I know oscar buddy comments are plain-text. Fixes bug 999922. Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.622 retrieving revision 1.623 diff -u -d -p -r1.622 -r1.623 --- oscar.c 31 Jul 2004 21:29:40 -0000 1.622 +++ oscar.c 31 Jul 2004 23:08:52 -0000 1.623 @@ -561,7 +561,7 @@ static void oscar_string_append_info(Gai g_free(tmp); } } else { - char *tmp = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); + tmp = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); if (aim_ssi_waitingforauth(od->sess->ssi.local, tmp, b->name)) oscar_string_append(str, newline, _("Status"), _("Not Authorized")); else @@ -570,7 +570,7 @@ static void oscar_string_append_info(Gai } if ((bi != NULL) && (bi->ipaddr != 0)) { - char *tmp = g_strdup_printf("%hhu.%hhu.%hhu.%hhu", + tmp = g_strdup_printf("%hhu.%hhu.%hhu.%hhu", (bi->ipaddr & 0xff000000) >> 24, (bi->ipaddr & 0x00ff0000) >> 16, (bi->ipaddr & 0x0000ff00) >> 8, @@ -588,8 +588,10 @@ static void oscar_string_append_info(Gai if ((b != NULL) && (b->name != NULL) && (g != NULL) && (g->name != NULL)) { tmp = aim_ssi_getcomment(od->sess->ssi.local, g->name, b->name); if (tmp != NULL) { - oscar_string_append(str, newline, _("Buddy Comment"), tmp); + char *tmp2 = g_markup_escape_text(tmp, strlen(tmp)); g_free(tmp); + oscar_string_append(str, newline, _("Buddy Comment"), tmp2); + g_free(tmp2); } } @@ -2218,7 +2220,8 @@ int gaim_memrequest(aim_session_t *sess, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); return 1; } - /* uncomment this when you're convinced it's right. remember, it's been wrong before. + /* uncomment this when you're convinced it's right. remember, it's been wrong before. */ +#if 0 if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) { char *buf; int i = 8; @@ -2244,7 +2247,7 @@ int gaim_memrequest(aim_session_t *sess, g_free(buf); return 1; } - */ +#endif pos = g_new0(struct pieceofcrap, 1); pos->gc = sess->aux_data; |