nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update account nickname in AccountsEditorListPane when it changes

Browse source
This commit is contained in:
Michael Gratton 2018-09-08 21:55:31 +10:00 • committed by Michael James Gratton
parent 81e04a21d5
commit b37d146a2d
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/client/accounts/accounts-editor-list-pane.vala
View file

@ -210,7 +210,7 @@ internal class Accounts.EditorListPane : Gtk.Grid, EditorPane {
Manager.Status status) { Manager.Status status) {
AccountListRow? row = get_account_row(account); AccountListRow? row = get_account_row(account);
if (row != null) { if (row != null) {
row.update(status); row.update_status(status);
} }
} }
@ -291,14 +291,28 @@ private class Accounts.AccountListRow : EditorRow<EditorListPane> {
this.layout.add(this.account_name); this.layout.add(this.account_name);
this.layout.add(this.account_details); this.layout.add(this.account_details);
update(status); this.account.information_changed.connect(on_account_changed);
update_nickname();
update_status(status);
}
~AccountListRow() {
this.account.information_changed.disconnect(on_account_changed);
} }
public override void activated(EditorListPane pane) { public override void activated(EditorListPane pane) {
pane.show_existing_account(this.account); pane.show_existing_account(this.account);
} }
public void update(Manager.Status status) { public void update_nickname() {
string name = this.account.nickname;
if (Geary.String.is_empty(name)) {
name = account.primary_mailbox.to_address_display("", "");
}
this.account_name.set_text(name);
}
public void update_status(Manager.Status status) {
if (status != Manager.Status.UNAVAILABLE) { if (status != Manager.Status.UNAVAILABLE) {
this.unavailable_icon.hide(); this.unavailable_icon.hide();
this.set_tooltip_text(""); this.set_tooltip_text("");
@ -309,12 +323,6 @@ private class Accounts.AccountListRow : EditorRow<EditorListPane> {
); );
} }
string name = this.account.nickname;
if (Geary.String.is_empty(name)) {
name = account.primary_mailbox.to_address_display("", "");
}
this.account_name.set_text(name);
string? details = this.account.service_label; string? details = this.account.service_label;
switch (account.service_provider) { switch (account.service_provider) {
case Geary.ServiceProvider.GMAIL: case Geary.ServiceProvider.GMAIL:
@ -348,6 +356,10 @@ private class Accounts.AccountListRow : EditorRow<EditorListPane> {
} }
} }
private void on_account_changed() {
update_nickname();
}
} }