Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/ui/chatwin.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,10 @@ chatwin_outgoing_msg(ProfChatWin* chatwin, const char* const message, const char

plugins_post_chat_message_display(myjid->barejid, myjid->resourcepart, display_message);

// save last id and message for LMC in case if it's not LMC message
if (id && !replace_id) {
_chatwin_set_last_message(chatwin, id, display_message);
// save last id and message for LMC
if (id) {
const char* const save_id = replace_id ? replace_id : id;
_chatwin_set_last_message(chatwin, save_id, display_message);
}
}

Expand Down Expand Up @@ -609,9 +610,13 @@ chatwin_db_history(ProfChatWin* chatwin, const char* start_time, const char* end
static void
_chatwin_set_last_message(ProfChatWin* chatwin, const char* const id, const char* const message)
{
free(chatwin->last_message);
chatwin->last_message = strdup(message);
if (chatwin->last_message != message) {
free(chatwin->last_message);
chatwin->last_message = strdup(message);
}

free(chatwin->last_msg_id);
chatwin->last_msg_id = strdup(id);
if (chatwin->last_msg_id != id) {
free(chatwin->last_msg_id);
chatwin->last_msg_id = strdup(id);
}
}
15 changes: 10 additions & 5 deletions src/ui/mucwin.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,8 @@ mucwin_outgoing_msg(ProfMucWin* mucwin, const char* const message, const char* c

// save last id and message for LMC
if (id) {
_mucwin_set_last_message(mucwin, id, message);
const char* const save_id = replace_id ? replace_id : id;
_mucwin_set_last_message(mucwin, save_id, message);
}

wins_add_quotes_ac(window, message, FALSE);
Expand Down Expand Up @@ -932,11 +933,15 @@ mucwin_unset_message_char(ProfMucWin* mucwin)
static void
_mucwin_set_last_message(ProfMucWin* mucwin, const char* const id, const char* const message)
{
free(mucwin->last_message);
mucwin->last_message = strdup(message);
if (mucwin->last_message != message) {
free(mucwin->last_message);
mucwin->last_message = strdup(message);
}

free(mucwin->last_msg_id);
mucwin->last_msg_id = strdup(id);
if (mucwin->last_msg_id != id) {
free(mucwin->last_msg_id);
mucwin->last_msg_id = strdup(id);
}
}

gchar*
Expand Down
Loading