aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Rename ProfBufferEntry jid variable

Browse Source
This commit is contained in:
Michael Vetter 2020-03-09 13:33:48 +01:00
parent f3d9de133e
commit a3889c94bc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/buffer.c
View File

@ -81,7 +81,7 @@ buffer_free(ProfBuff buffer)
} }
void void
buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime *time, int flags, theme_item_t theme_item, const char *const display_from, const char *const barejid, const char *const message, DeliveryReceipt *receipt, const char *const id) buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime *time, int flags, theme_item_t theme_item, const char *const display_from, const char *const from_jid, const char *const message, DeliveryReceipt *receipt, const char *const id)
{ {
ProfBuffEntry *e = malloc(sizeof(struct prof_buff_entry_t)); ProfBuffEntry *e = malloc(sizeof(struct prof_buff_entry_t));
e->show_char = strdup(show_char); e->show_char = strdup(show_char);
@ -90,7 +90,7 @@ buffer_append(ProfBuff buffer, const char *show_char, int pad_indent, GDateTime
e->theme_item = theme_item; e->theme_item = theme_item;
e->time = g_date_time_ref(time); e->time = g_date_time_ref(time);
e->display_from = display_from ? strdup(display_from) : NULL; e->display_from = display_from ? strdup(display_from) : NULL;
e->barejid = barejid ? strdup(barejid) : NULL; e->from_jid = from_jid ? strdup(from_jid) : NULL;
e->message = strdup(message); e->message = strdup(message);
e->receipt = receipt; e->receipt = receipt;
if (id) { if (id) {
@ -168,7 +168,7 @@ _free_entry(ProfBuffEntry *entry)
free(entry->show_char); free(entry->show_char);
free(entry->message); free(entry->message);
free(entry->display_from); free(entry->display_from);
free(entry->barejid); free(entry->from_jid);
free(entry->id); free(entry->id);
free(entry->receipt); free(entry->receipt);
g_date_time_unref(entry->time); g_date_time_unref(entry->time);

2
src/ui/buffer.h
View File

@ -56,7 +56,7 @@ typedef struct prof_buff_entry_t {
// from as it is displayed // from as it is displayed
// might be nick, jid.. // might be nick, jid..
char *display_from; char *display_from;
char *barejid; char *from_jid;
char *message; char *message;
DeliveryReceipt *receipt; DeliveryReceipt *receipt;
// message id, in case we have it // message id, in case we have it

6
src/ui/window.c
View File

@ -1071,9 +1071,9 @@ _win_correct(ProfWin *window, const char *const message, const char *const id, c
return; return;
} }
if (g_strcmp0(entry->barejid, from_jid) != 0) { if (g_strcmp0(entry->from_jid, from_jid) != 0) {
log_debug("Illicit LMC attempt from %s for message from %s with: %s", from_jid, entry->barejid, message); log_debug("Illicit LMC attempt from %s for message from %s with: %s", from_jid, entry->from_jid, message);
cons_show("Illicit LMC attempt from %s for message from %s", from_jid, entry->barejid); cons_show("Illicit LMC attempt from %s for message from %s", from_jid, entry->from_jid);
return; return;
} }