comparison: src/server.c
src/server.c
- changeset 9584
- 1a6198375303
- parent 9514
- 05247f11e65c
- child 9594
- 7a1f902b9494
equal
deleted
inserted
replaced
| 9583:02ddd25cc6e4 | 9584:1a6198375303 |
|---|---|
| 1519 | 1519 |
| 1520 gaim_conv_chat_left(GAIM_CONV_CHAT(conv)); | 1520 gaim_conv_chat_left(GAIM_CONV_CHAT(conv)); |
| 1521 } | 1521 } |
| 1522 | 1522 |
| 1523 void serv_got_chat_in(GaimConnection *g, int id, const char *who, | 1523 void serv_got_chat_in(GaimConnection *g, int id, const char *who, |
| 1524 int whisper, const char *message, time_t mtime) | 1524 GaimConvChatFlags chatflags, const char *message, time_t mtime) |
| 1525 { | 1525 { |
| 1526 GaimMessageFlags w; | 1526 GaimMessageFlags msgflags = 0; |
| 1527 GSList *bcs; | 1527 GSList *bcs; |
| 1528 GaimConversation *conv = NULL; | 1528 GaimConversation *conv = NULL; |
| 1529 GaimConvChat *chat = NULL; | 1529 GaimConvChat *chat = NULL; |
| 1530 char *buf; | 1530 char *buf; |
| 1531 char *buffy, *angel; | 1531 char *buffy, *angel; |
| 1576 who, message, conv); | 1576 who, message, conv); |
| 1577 | 1577 |
| 1578 /* Make sure URLs are clickable */ | 1578 /* Make sure URLs are clickable */ |
| 1579 buf = gaim_markup_linkify(message); | 1579 buf = gaim_markup_linkify(message); |
| 1580 | 1580 |
| 1581 if (whisper) | 1581 if (chatflags & GAIM_CONV_CHAT_WHISPER) |
| 1582 w = GAIM_MESSAGE_WHISPER; | 1582 msgflags |= GAIM_MESSAGE_WHISPER; |
| 1583 else | 1583 if (chatflags & GAIM_CONV_CHAT_DELAYED) |
| 1584 w = 0; | 1584 msgflags |= GAIM_MESSAGE_DELAYED; |
| 1585 | 1585 |
| 1586 gaim_conv_chat_write(chat, who, buf, w, mtime); | 1586 gaim_conv_chat_write(chat, who, buf, msgflags, mtime); |
| 1587 | 1587 |
| 1588 g_free(angel); | 1588 g_free(angel); |
| 1589 g_free(buf); | 1589 g_free(buf); |
| 1590 g_free(buffy); | 1590 g_free(buffy); |
| 1591 } | 1591 } |
