Mercurial > pidgin
comparison src/protocols/yahoo/yahoochat.c @ 12216:4d3119205a33
[gaim-migrate @ 14518]
Remove GaimConvImFlags and GaimConvChatFlags - use GaimMessageFlags
everywhere instead.
Add a new GAIM_MESSAGE_IMAGES flag, and set it when sending a message
containing images.
When sending a message, the core will now always send "html" to the prpls,
just like it expects to receive html from the prpls for received messages.
This will allow text prpls such as SILC to support IM images and differentiate
them from user input. Previously gaim_unescape_html() was used before passing
the message to the prpl, now the prpl does this itself if it needs it.
I think I updated all the prpls correctly, but I'm not so sure about sametime.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Thu, 24 Nov 2005 20:47:46 +0000 |
parents | c9a943c60c33 |
children | 27c4145c6daa |
comparison
equal
deleted
inserted
replaced
12215:31b91bfab029 | 12216:4d3119205a33 |
---|---|
800 } | 800 } |
801 | 801 |
802 return FALSE; | 802 return FALSE; |
803 } | 803 } |
804 | 804 |
805 static int yahoo_chat_send(GaimConnection *gc, const char *dn, const char *room, const char *what) | 805 static int yahoo_chat_send(GaimConnection *gc, const char *dn, const char *room, const char *what, GaimMessageFlags flags) |
806 { | 806 { |
807 struct yahoo_data *yd = gc->proto_data; | 807 struct yahoo_data *yd = gc->proto_data; |
808 struct yahoo_packet *pkt; | 808 struct yahoo_packet *pkt; |
809 int me = 0; | 809 int me = 0; |
810 char *msg1, *msg2, *room2; | 810 char *msg1, *msg2, *room2; |
941 } | 941 } |
942 | 942 |
943 serv_got_chat_left(gc, id); | 943 serv_got_chat_left(gc, id); |
944 } | 944 } |
945 | 945 |
946 int yahoo_c_send(GaimConnection *gc, int id, const char *what) | 946 int yahoo_c_send(GaimConnection *gc, int id, const char *what, GaimMessageFlags flags) |
947 { | 947 { |
948 GaimConversation *c; | 948 GaimConversation *c; |
949 int ret; | 949 int ret; |
950 struct yahoo_data *yd; | 950 struct yahoo_data *yd; |
951 | 951 |
960 if (id != YAHOO_CHAT_ID) { | 960 if (id != YAHOO_CHAT_ID) { |
961 ret = yahoo_conf_send(gc, gaim_connection_get_display_name(gc), | 961 ret = yahoo_conf_send(gc, gaim_connection_get_display_name(gc), |
962 gaim_conversation_get_name(c), gaim_conv_chat_get_users(GAIM_CONV_CHAT(c)), what); | 962 gaim_conversation_get_name(c), gaim_conv_chat_get_users(GAIM_CONV_CHAT(c)), what); |
963 } else { | 963 } else { |
964 ret = yahoo_chat_send(gc, gaim_connection_get_display_name(gc), | 964 ret = yahoo_chat_send(gc, gaim_connection_get_display_name(gc), |
965 gaim_conversation_get_name(c), what); | 965 gaim_conversation_get_name(c), what, flags); |
966 if (!ret) | 966 if (!ret) |
967 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(c)), | 967 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(c)), |
968 gaim_connection_get_display_name(gc), 0, what, time(NULL)); | 968 gaim_connection_get_display_name(gc), 0, what, time(NULL)); |
969 } | 969 } |
970 return ret; | 970 return ret; |