devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
Conversation 6 Commits 407 Files Changed 303 +6074 -27521
206 changed files with 6074 additions and 27521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 110b359ee1 - Show all commits

2
src/config/color.c
View File

@@ -369,7 +369,7 @@ find_col(const char* col_name, int n)
* blue. * blue.
*/ */
if (n >= sizeof(name)) { if (n >= (int)sizeof(name)) {
/* truncate */ /* truncate */
log_error("Color: <%s,%d> bigger than %zu", col_name, n, sizeof(name)); log_error("Color: <%s,%d> bigger than %zu", col_name, n, sizeof(name));
n = sizeof(name) - 1; n = sizeof(name) - 1;

2
src/ui/mucwin.c
View File

@@ -497,7 +497,7 @@ _mucwin_print_triggers(ProfWin* window, const char* const message, GList* trigge
} }
trigger_section[i] = '\0'; trigger_section[i] = '\0';
if (first_trigger_pos + first_trigger_len < strlen(message)) { if (first_trigger_pos + first_trigger_len < (int)strlen(message)) {
win_append_highlight(window, THEME_ROOMTRIGGER_TERM, "%s", trigger_section); win_append_highlight(window, THEME_ROOMTRIGGER_TERM, "%s", trigger_section);
_mucwin_print_triggers(window, &message[first_trigger_pos + first_trigger_len], triggers); _mucwin_print_triggers(window, &message[first_trigger_pos + first_trigger_len], triggers);
} else { } else {