Mercurial > pidgin.yaz

comparison src/protocols/oscar/oscar.c @ 8800:9693c881ac78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9562] You might think, "Yeah, I fixed that." But you didn't. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 24 Apr 2004 17:35:17 +0000
parents d7b8eb1f0a18
children 518455386538
comparison
equal deleted inserted replaced
8799:135e295a05bb 8800:9693c881ac78
4517 OscarData *od = (OscarData *)gc->proto_data; 4517 OscarData *od = (OscarData *)gc->proto_data;
4518 struct direct_im *dim = find_direct_im(od, name); 4518 struct direct_im *dim = find_direct_im(od, name);
4519 int ret = 0; 4519 int ret = 0;
4520 GError *err = NULL; 4520 GError *err = NULL;
4521 const char *iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc)); 4521 const char *iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc));
4522 char *tmpmsg = NULL; 4522 char *tmpmsg = NULL, *tmpmsg2 = NULL;
4523 4523
4524 if (dim && dim->connected) { 4524 if (dim && dim->connected) {
4525 /* If we're directly connected, send a direct IM */ 4525 /* If we're directly connected, send a direct IM */
4526 ret = gaim_odc_send_im(od->sess, dim->conn, message, imflags); 4526 ret = gaim_odc_send_im(od->sess, dim->conn, message, imflags);
4527 } else if (imflags & GAIM_CONV_IM_IMAGES) { 4527 } else if (imflags & GAIM_CONV_IM_IMAGES) {
4591 } 4591 }
4592 4592
4593 args.destsn = name; 4593 args.destsn = name;
4594 4594
4595 /* For ICQ send newlines as CR/LF, for AIM send newlines as <BR> */ 4595 /* For ICQ send newlines as CR/LF, for AIM send newlines as <BR> */
4596 if (isdigit(name[0])) 4596 /* Also strip HTML for ICQ */
4597 tmpmsg = gaim_str_add_cr(message); 4597 if (isdigit(name[0])) {
4598 else 4598 tmpmsg2 = gaim_markup_strip_html(message);
4599 tmpmsg = gaim_str_add_cr(tmpmsg2);
4600 g_free(tmpmsg2);
4601 } else
4599 tmpmsg = gaim_strdup_withhtml(message); 4602 tmpmsg = gaim_strdup_withhtml(message);
4600 len = strlen(tmpmsg); 4603 len = strlen(tmpmsg);
4601 4604
4602 args.flags |= oscar_encoding_check(tmpmsg); 4605 args.flags |= oscar_encoding_check(tmpmsg);
4603 if (args.flags & AIM_IMFLAGS_UNICODE) { 4606 if (args.flags & AIM_IMFLAGS_UNICODE) {