Mercurial > pidgin.yaz
comparison src/protocols/msn/msn.c @ 8442:3d0178c4f390
[gaim-migrate @ 9172]
" This is that thing Sean told me to do. Well part of it.
We now are careful to send html to gtkimhtml when
sending a message, while still sending plain text to
those protocols that need it. We send the fancy html on
all the signals we emit though. Sean didn't say what to
do about those. I figure always sending html on signals
sounds good.
I'm not sure I like how I did this exactly, especially
with respect to whether it's the core or ui's job to
make sure the html prpl flag gets honored. But it
should be good enough for now.
Anyway, this fixes the "sending someone <> on
IRC/ICQ/MSN/etc shows up blank on my end!" problem.
All prpls need to pass html to the core now, as Sean
said in his email. I made msn, and gg comply. IRC was
cool enough to already be complying. Jabber is so cool
it actually takes html and isn't effected by this.
ICQ, OSCAR, Trepia, zephyr, and napster still need to
be fixed. (Note that it's not this patch that breaks
them, they're already broken in CVS). I think TOC uses
html and isn't effected.
I'm not bothering with the old ICQ prpl. I'm not sure
what's going on in trepia. I'm even less sure what's
going on in zephyr. I didn't even check if napster used
html or not.
For OSCAR, I'm hoping I can get KingAnt to fix it.
Normally I'd say, ICQ messages all need
gaim_escape_html called on them. But what about
receiving an ICQ messagefrom an AIM account, or vise versa?" -- marv yet
again
(00:48:48) LSchiere: marv: should i apply the patch sean asked for or
should i wait for him to look at it?
(00:49:17) marv: LSchiere: he talked like I should get it applied by
someone not him
(00:49:21) LSchiere: kay
(00:49:29) marv: he said i knew the appropriate people to talk to
(00:50:16) LSchiere: KingAnt: marv is making work for you
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sun, 14 Mar 2004 05:42:56 +0000 |
parents | 57e5ef6b7a69 |
children | 06f57183e29f |
comparison
equal
deleted
inserted
replaced
8441:ea999c4a9a11 | 8442:3d0178c4f390 |
---|---|
560 else { | 560 else { |
561 /* | 561 /* |
562 * In MSN, you can't send messages to yourself, so | 562 * In MSN, you can't send messages to yourself, so |
563 * we'll fake like we received it ;) | 563 * we'll fake like we received it ;) |
564 */ | 564 */ |
565 gchar *fakemsg = gaim_escape_html(message); | |
565 serv_got_typing_stopped(gc, (char *)who); | 566 serv_got_typing_stopped(gc, (char *)who); |
566 serv_got_im(gc, who, message, flags, | 567 serv_got_im(gc, who, fakemsg, flags, |
567 time(NULL)); | 568 time(NULL)); |
569 g_free(fakemsg); | |
568 } | 570 } |
569 | 571 |
570 return 1; | 572 return 1; |
571 } | 573 } |
572 | 574 |
1033 { | 1035 { |
1034 GaimAccount *account = gaim_connection_get_account(gc); | 1036 GaimAccount *account = gaim_connection_get_account(gc); |
1035 MsnSession *session = gc->proto_data; | 1037 MsnSession *session = gc->proto_data; |
1036 MsnSwitchBoard *swboard = msn_session_find_switch_with_id(session, id); | 1038 MsnSwitchBoard *swboard = msn_session_find_switch_with_id(session, id); |
1037 MsnMessage *msg; | 1039 MsnMessage *msg; |
1038 char *send; | 1040 char *send, *recv; |
1039 | 1041 |
1040 if (swboard == NULL) | 1042 if (swboard == NULL) |
1041 return -EINVAL; | 1043 return -EINVAL; |
1042 | 1044 |
1043 send = gaim_str_add_cr(message); | 1045 send = gaim_str_add_cr(message); |
1057 return 0; | 1059 return 0; |
1058 } | 1060 } |
1059 | 1061 |
1060 msn_message_destroy(msg); | 1062 msn_message_destroy(msg); |
1061 | 1063 |
1064 recv = gaim_escape_html(message); | |
1062 serv_got_chat_in(gc, id, gaim_account_get_username(account), | 1065 serv_got_chat_in(gc, id, gaim_account_get_username(account), |
1063 0, message, time(NULL)); | 1066 0, recv, time(NULL)); |
1067 g_free(recv); | |
1064 | 1068 |
1065 return 0; | 1069 return 0; |
1066 } | 1070 } |
1067 | 1071 |
1068 static void | 1072 static void |