Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 9625:3ec0b63d4f2e
[gaim-migrate @ 10469]
As far as I know oscar buddy comments are plain-text.
Fixes bug 999922.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 31 Jul 2004 23:08:52 +0000 |
parents | c001be3c330e |
children | afd069368860 |
comparison
equal
deleted
inserted
replaced
9624:abacf29577b2 | 9625:3ec0b63d4f2e |
---|---|
559 tmp = oscar_icqstatus((b->uc & 0xffff0000) >> 16); | 559 tmp = oscar_icqstatus((b->uc & 0xffff0000) >> 16); |
560 oscar_string_append(str, newline, _("Status"), tmp); | 560 oscar_string_append(str, newline, _("Status"), tmp); |
561 g_free(tmp); | 561 g_free(tmp); |
562 } | 562 } |
563 } else { | 563 } else { |
564 char *tmp = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); | 564 tmp = aim_ssi_itemlist_findparentname(od->sess->ssi.local, b->name); |
565 if (aim_ssi_waitingforauth(od->sess->ssi.local, tmp, b->name)) | 565 if (aim_ssi_waitingforauth(od->sess->ssi.local, tmp, b->name)) |
566 oscar_string_append(str, newline, _("Status"), _("Not Authorized")); | 566 oscar_string_append(str, newline, _("Status"), _("Not Authorized")); |
567 else | 567 else |
568 oscar_string_append(str, newline, _("Status"), _("Offline")); | 568 oscar_string_append(str, newline, _("Status"), _("Offline")); |
569 } | 569 } |
570 } | 570 } |
571 | 571 |
572 if ((bi != NULL) && (bi->ipaddr != 0)) { | 572 if ((bi != NULL) && (bi->ipaddr != 0)) { |
573 char *tmp = g_strdup_printf("%hhu.%hhu.%hhu.%hhu", | 573 tmp = g_strdup_printf("%hhu.%hhu.%hhu.%hhu", |
574 (bi->ipaddr & 0xff000000) >> 24, | 574 (bi->ipaddr & 0xff000000) >> 24, |
575 (bi->ipaddr & 0x00ff0000) >> 16, | 575 (bi->ipaddr & 0x00ff0000) >> 16, |
576 (bi->ipaddr & 0x0000ff00) >> 8, | 576 (bi->ipaddr & 0x0000ff00) >> 8, |
577 (bi->ipaddr & 0x000000ff)); | 577 (bi->ipaddr & 0x000000ff)); |
578 oscar_string_append(str, newline, _("IP Address"), tmp); | 578 oscar_string_append(str, newline, _("IP Address"), tmp); |
586 } | 586 } |
587 | 587 |
588 if ((b != NULL) && (b->name != NULL) && (g != NULL) && (g->name != NULL)) { | 588 if ((b != NULL) && (b->name != NULL) && (g != NULL) && (g->name != NULL)) { |
589 tmp = aim_ssi_getcomment(od->sess->ssi.local, g->name, b->name); | 589 tmp = aim_ssi_getcomment(od->sess->ssi.local, g->name, b->name); |
590 if (tmp != NULL) { | 590 if (tmp != NULL) { |
591 oscar_string_append(str, newline, _("Buddy Comment"), tmp); | 591 char *tmp2 = g_markup_escape_text(tmp, strlen(tmp)); |
592 g_free(tmp); | 592 g_free(tmp); |
593 oscar_string_append(str, newline, _("Buddy Comment"), tmp2); | |
594 g_free(tmp2); | |
593 } | 595 } |
594 } | 596 } |
595 | 597 |
596 if ((bi != NULL) && (bi->availmsg != NULL) && !(b->uc & UC_UNAVAILABLE)) { | 598 if ((bi != NULL) && (bi->availmsg != NULL) && !(b->uc & UC_UNAVAILABLE)) { |
597 tmp = g_markup_escape_text(bi->availmsg, strlen(bi->availmsg)); | 599 tmp = g_markup_escape_text(bi->availmsg, strlen(bi->availmsg)); |
2216 gaim_debug_misc("oscar", "len is 0, hashing NULL\n"); | 2218 gaim_debug_misc("oscar", "len is 0, hashing NULL\n"); |
2217 aim_sendmemblock(sess, fr->conn, offset, len, NULL, | 2219 aim_sendmemblock(sess, fr->conn, offset, len, NULL, |
2218 AIM_SENDMEMBLOCK_FLAG_ISREQUEST); | 2220 AIM_SENDMEMBLOCK_FLAG_ISREQUEST); |
2219 return 1; | 2221 return 1; |
2220 } | 2222 } |
2221 /* uncomment this when you're convinced it's right. remember, it's been wrong before. | 2223 /* uncomment this when you're convinced it's right. remember, it's been wrong before. */ |
2224 #if 0 | |
2222 if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) { | 2225 if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) { |
2223 char *buf; | 2226 char *buf; |
2224 int i = 8; | 2227 int i = 8; |
2225 if (modname) | 2228 if (modname) |
2226 i += strlen(modname); | 2229 i += strlen(modname); |
2242 "hashing request\n"); | 2245 "hashing request\n"); |
2243 aim_sendmemblock(sess, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); | 2246 aim_sendmemblock(sess, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); |
2244 g_free(buf); | 2247 g_free(buf); |
2245 return 1; | 2248 return 1; |
2246 } | 2249 } |
2247 */ | 2250 #endif |
2248 | 2251 |
2249 pos = g_new0(struct pieceofcrap, 1); | 2252 pos = g_new0(struct pieceofcrap, 1); |
2250 pos->gc = sess->aux_data; | 2253 pos->gc = sess->aux_data; |
2251 pos->conn = fr->conn; | 2254 pos->conn = fr->conn; |
2252 | 2255 |