Mercurial > pidgin
comparison libpurple/protocols/silc/chat.c @ 23152:caa533b62902
When calling serv_got_chat_in() after sending a group chat message (to let
the core know that it was sent, since unlike sending an IM conversation
message it is not immedately written out to the conversation by
common_send()), pass back the flags initially sent to the prpl. This maintains
the PURPLE_MESSAGE_SEND flag as well as anything else which might be
helpful to the UI, such as PURPLE_MESSAGE_IMAGES.
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Wed, 14 May 2008 23:36:37 +0000 |
parents | 29235834c692 |
children | 16734635febf cc1e35fa774d |
comparison
equal
deleted
inserted
replaced
23151:f26f6a854770 | 23152:caa533b62902 |
---|---|
1313 silc_buffer_len(buf)); | 1313 silc_buffer_len(buf)); |
1314 silc_mime_partial_free(list); | 1314 silc_mime_partial_free(list); |
1315 g_free(tmp); | 1315 g_free(tmp); |
1316 | 1316 |
1317 if (ret) | 1317 if (ret) |
1318 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg, time(NULL)); | 1318 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), msgflags, msg, time(NULL)); |
1319 return ret; | 1319 return ret; |
1320 } | 1320 } |
1321 } | 1321 } |
1322 | 1322 |
1323 /* Send channel message */ | 1323 /* Send channel message */ |
1324 ret = silc_client_send_channel_message(client, conn, channel, key, | 1324 ret = silc_client_send_channel_message(client, conn, channel, key, |
1325 flags, sg->sha1hash, | 1325 flags, sg->sha1hash, |
1326 (unsigned char *)msg2, | 1326 (unsigned char *)msg2, |
1327 strlen(msg2)); | 1327 strlen(msg2)); |
1328 if (ret) { | 1328 if (ret) { |
1329 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg, | 1329 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), msgflags, msg, |
1330 time(NULL)); | 1330 time(NULL)); |
1331 } | 1331 } |
1332 g_free(tmp); | 1332 g_free(tmp); |
1333 | 1333 |
1334 return ret; | 1334 return ret; |