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

Respect /roster room use setting also when sorted for service

Browse Source
This commit is contained in:
Michael Vetter 2020-01-23 18:29:49 +01:00
parent 31509022ef
commit 10c4032d12
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ui/rosterwin.c
View File

@ -768,18 +768,23 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
if ((g_strcmp0(unreadpos, "before") == 0) && mucwin->unread > 0) { if ((g_strcmp0(unreadpos, "before") == 0) && mucwin->unread > 0) {
g_string_append_printf(msg, "(%d) ", mucwin->unread); g_string_append_printf(msg, "(%d) ", mucwin->unread);
} }
char *use_as_name = prefs_get_string(PREF_ROSTER_ROOMS_USE_AS_NAME);
char *roombypref = prefs_get_string(PREF_ROSTER_ROOMS_BY); char *roombypref = prefs_get_string(PREF_ROSTER_ROOMS_BY);
if (g_strcmp0(roombypref, "service") == 0) { if (g_strcmp0(roombypref, "service") == 0) {
Jid *jidp = jid_create(mucwin->roomjid); if (mucwin->room_name == NULL || (g_strcmp0(use_as_name, "jid") == 0)) {
g_string_append(msg, jidp->localpart); Jid *jidp = jid_create(mucwin->roomjid);
jid_destroy(jidp); g_string_append(msg, jidp->localpart);
jid_destroy(jidp);
} else {
g_string_append(msg, mucwin->room_name);
}
} else { } else {
gboolean show_server = prefs_get_boolean(PREF_ROSTER_ROOMS_SERVER); gboolean show_server = prefs_get_boolean(PREF_ROSTER_ROOMS_SERVER);
char *use_as_name = prefs_get_string(PREF_ROSTER_ROOMS_USE_AS_NAME);
if (show_server) { if (show_server) {
if (mucwin->room_name == NULL || if (mucwin->room_name == NULL || (g_strcmp0(use_as_name, "jid") == 0)) {
(g_strcmp0(use_as_name, "jid") == 0)) {
g_string_append(msg, mucwin->roomjid); g_string_append(msg, mucwin->roomjid);
} else { } else {
g_string_append(msg, mucwin->room_name); g_string_append(msg, mucwin->room_name);
@ -796,10 +801,11 @@ _rosterwin_room(ProfLayoutSplit *layout, ProfMucWin *mucwin)
jid_destroy(jidp); jid_destroy(jidp);
} }
prefs_free_string(use_as_name);
} }
prefs_free_string(use_as_name);
prefs_free_string(roombypref); prefs_free_string(roombypref);
if ((g_strcmp0(unreadpos, "after") == 0) && mucwin->unread > 0) { if ((g_strcmp0(unreadpos, "after") == 0) && mucwin->unread > 0) {
g_string_append_printf(msg, " (%d)", mucwin->unread); g_string_append_printf(msg, " (%d)", mucwin->unread);
} }