[connections/add-helper-for-name-resolution] connection: Add helper method for visible name resolution
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [connections/add-helper-for-name-resolution] connection: Add helper method for visible name resolution
- Date: Wed, 26 May 2021 13:25:04 +0000 (UTC)
commit ca511ff7738f0d9dba8d487e2508546c13d1e714
Author: Felipe Borges <felipeborges gnome org>
Date: Wed May 26 15:23:38 2021 +0200
connection: Add helper method for visible name resolution
So users can set a human-readable name to this connection but we
can still fallback to the uri when a name isn't available.
src/collection-view-child.vala | 5 +----
src/connection.vala | 9 ++++++++-
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/collection-view-child.vala b/src/collection-view-child.vala
index b176b41..1df4dfa 100644
--- a/src/collection-view-child.vala
+++ b/src/collection-view-child.vala
@@ -44,10 +44,7 @@ namespace Connections {
}
private void update_display_name () {
- if (connection.display_name != null && connection.display_name != "")
- connection_name.set_text (connection.display_name);
- else
- connection_name.set_text (connection.uri);
+ connection_name.set_text (connection.get_visible_name ());
}
private async void update_thumbnail () {
diff --git a/src/connection.vala b/src/connection.vala
index 2609a04..33c16f7 100644
--- a/src/connection.vala
+++ b/src/connection.vala
@@ -125,7 +125,7 @@ namespace Connections {
auth_notification = null;
};
- var auth_string = _("ā%sā requires authentication").printf (display_name);
+ var auth_string = _("ā%sā requires authentication").printf (get_visible_name ());
auth_notification =
Application.application.main_window.notifications_bar.display_for_auth (auth_string,
(owned) auth_func,
@@ -157,6 +157,13 @@ namespace Connections {
Database.get_default ().save_property (this, pspec.name);
}
+ public string get_visible_name () {
+ if (display_name != null && display_name != "")
+ return display_name;
+
+ return uri;
+ }
+
public abstract void connect_it ();
public abstract void disconnect_it ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]