Skip to content

Commit

Permalink
Fix codestyle add account display name instead of allias
Browse files Browse the repository at this point in the history
  • Loading branch information
Psayker committed Apr 17, 2024
1 parent f9ebf64 commit 3882ae0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion libdino/src/util/display_name.vala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Xmpp;
namespace Dino {
public static string get_conversation_display_name(StreamInteractor stream_interactor, Conversation conversation, string? muc_pm_format) {
if (conversation.type_ == Conversation.Type.CHAT) {
string? display_name = get_real_display_name(stream_interactor, conversation.account, conversation.counterpart);
string? display_name = get_real_display_name(stream_interactor, conversation.account, conversation.counterpart, conversation.account.display_name);
if (display_name != null) return display_name;
return conversation.counterpart.to_string();
}
Expand Down
6 changes: 3 additions & 3 deletions main/src/ui/add_conversation/roster_list.vala
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ protected class RosterList {
foreach (ulong handler_id in handler_ids) stream_interactor.get_module(RosterManager.IDENTITY).disconnect(handler_id);
});

foreach (Account a in accounts){
foreach(Account a in accounts) {
ListRow own_account_row = new ListRow.from_jid(stream_interactor, a.bare_jid, a, accounts.size > 1);
ListBoxRow own_account_lbrow = new ListBoxRow() { child=own_account_row };
ListBoxRow own_account_lbrow = new ListBoxRow() { child = own_account_row };
list_box.append(own_account_lbrow);

fetch_roster_items(a);
Expand All @@ -53,7 +53,7 @@ protected class RosterList {
private void on_updated_roster_item(Account account, Jid jid, Roster.Item roster_item) {
on_removed_roster_item(account, jid, roster_item);
ListRow row = new ListRow.from_jid(stream_interactor, roster_item.jid, account, accounts.size > 1);
ListBoxRow list_box_row = new ListBoxRow() { child=row };
ListBoxRow list_box_row = new ListBoxRow() { child = row };
rows[account][jid] = list_box_row;
list_box.append(list_box_row);
list_box.invalidate_sort();
Expand Down

0 comments on commit 3882ae0

Please sign in to comment.