aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

move titlebar code in correct function

Browse Source
This commit is contained in:
Michael Vetter 2020-03-24 21:46:40 +01:00
parent 3c56b289ed
commit fd090d384d
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ui/titlebar.c
View File

@ -191,25 +191,7 @@ _title_bar_draw(void)
waddch(win, ' '); waddch(win, ' ');
} }
char *title = NULL; char *title = win_get_title(current);
if (current && current->type == WIN_MUC) {
char *use_as_name = prefs_get_string(PREF_TITLEBAR_MUC_TITLE);
if ((g_strcmp0(use_as_name, "name") == 0)) {
ProfMucWin *mucwin = (ProfMucWin*) current;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
if (mucwin->room_name) {
title = strdup(mucwin->room_name);
}
}
prefs_free_string(use_as_name);
}
if (title == NULL) {
title = win_get_title(current);
}
mvwprintw(win, 0, 0, " %s", title); mvwprintw(win, 0, 0, " %s", title);
free(title); free(title);

8
src/ui/window.c
View File

@ -299,8 +299,16 @@ win_get_title(ProfWin *window)
if (window->type == WIN_MUC) { if (window->type == WIN_MUC) {
ProfMucWin *mucwin = (ProfMucWin*) window; ProfMucWin *mucwin = (ProfMucWin*) window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
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); return strdup(mucwin->roomjid);
} }
}
if (window->type == WIN_CONFIG) { if (window->type == WIN_CONFIG) {
ProfConfWin *confwin = (ProfConfWin*) window; ProfConfWin *confwin = (ProfConfWin*) window;
assert(confwin->memcheck == PROFCONFWIN_MEMCHECK); assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);