Merge remote-tracking branch 'upstream/master' into merge/upstream-full

# Conflicts:
#	CONTRIBUTING.md
#	src/profanity.c
#	src/tools/editor.c
This commit is contained in:
2026-04-18 12:26:52 +03:00
6 changed files with 32 additions and 2 deletions

View File

@@ -150,6 +150,8 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
if (!background_mode) {
ui_update();
}
while (g_main_context_iteration(NULL, FALSE))
;
#ifdef HAVE_GTK
tray_update();
#endif