From fd090d384da14a6fe65cfb4ecb23f02c29d10eba Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 24 Mar 2020 21:46:40 +0100 Subject: move titlebar code in correct function --- src/ui/window.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/ui/window.c') diff --git a/src/ui/window.c b/src/ui/window.c index 1a7cfc21..9ccc19ee 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -299,7 +299,15 @@ win_get_title(ProfWin *window) if (window->type == WIN_MUC) { ProfMucWin *mucwin = (ProfMucWin*) window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - return strdup(mucwin->roomjid); + + char *use_as_name = prefs_get_string(PREF_TITLEBAR_MUC_TITLE); + if ((g_strcmp0(use_as_name, "name") == 0) && mucwin->room_name) { + prefs_free_string(use_as_name); + return strdup(mucwin->room_name); + } else { + prefs_free_string(use_as_name); + return strdup(mucwin->roomjid); + } } if (window->type == WIN_CONFIG) { ProfConfWin *confwin = (ProfConfWin*) window; -- cgit 1.4.1-2-gfad0