comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 32777
- 30e3ac21adff
- parent 32776
- 177d71b1a491
- child 32778
- a0be82d9c0f1
equal
deleted
inserted
replaced
| 32776:177d71b1a491 | 32777:30e3ac21adff |
|---|---|
| 6284 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_NEXT_CONTENT); | 6284 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_NEXT_CONTENT); |
| 6285 func = "appendNextMessage"; | 6285 func = "appendNextMessage"; |
| 6286 } else if (flags & PURPLE_MESSAGE_SEND) { | 6286 } else if (flags & PURPLE_MESSAGE_SEND) { |
| 6287 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_CONTENT); | 6287 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_OUTGOING_CONTENT); |
| 6288 } else if ((flags & PURPLE_MESSAGE_RECV) && (old_flags & PURPLE_MESSAGE_RECV)) { | 6288 } else if ((flags & PURPLE_MESSAGE_RECV) && (old_flags & PURPLE_MESSAGE_RECV)) { |
| 6289 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_NEXT_CONTENT); | 6289 GList *history = purple_conversation_get_message_history(conv); |
| 6290 func = "appendNextMessage"; | 6290 PurpleConvMessage *last_msg = (PurpleConvMessage *)history->data; |
| 6291 | |
| 6292 /* If the senders are the same, use appendNextMessage */ | |
| 6293 if (purple_strequal(purple_conversation_message_get_sender(last_msg), name)) { | |
| 6294 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_NEXT_CONTENT); | |
| 6295 func = "appendNextMessage"; | |
| 6296 } else { | |
| 6297 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT); | |
| 6298 } | |
| 6291 } else if (flags & PURPLE_MESSAGE_RECV) { | 6299 } else if (flags & PURPLE_MESSAGE_RECV) { |
| 6292 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT); | 6300 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_INCOMING_CONTENT); |
| 6293 } else { | 6301 } else { |
| 6294 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS); | 6302 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS); |
| 6295 } | 6303 } |
