HardwareView: Fix fallback when hostname1 returns null values #355
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi ryonakano! I'll do it tomorrow if you don't mind;) |
|
Thank you for waiting! So, I can confirm that my problem is solved! One little oddity: the host name disappeared in Settings → System → Hardware: I will attach the logs: G_MESSAGES_DEBUG=all io.elementary.settings gdb io.elementary.settings |
|
Thank you for your testing!
I guess this is because getting private string get_host_name () {
get_system_interface_instance ();
if (system_interface == null) {
return GLib.Environment.get_host_name ();
}
string? hostname = system_interface.pretty_hostname;
if (hostname == null || hostname.length == 0) {
hostname = system_interface.static_hostname; // maybe this still results null on your system
}
return hostname;
}I think this can be fixed by falling back to |
|
@pibiba Could you share the outputs of the following two commands? |
|
Yes, sure: |
|
Hostname1 interface is provided by systemd and Artix is a non-systemd distro 😅 |
Yes, we know. After all, the goal is to make pantheon work on non-systemd distros too. |
|
Yes, so the result of the dbus-send is expected, just wanted to make sure. I set up an Artix Base on a VM today, played with a test code, and noticed that It means private void get_system_interface_instance () {
if (system_interface == null) {
try {
system_interface = Bus.get_proxy_sync (
BusType.SYSTEM,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1"
);
} catch (GLib.Error e) { // Never threw an error when the DBus name isn't provided
warning ("%s", e.message);
}
}
}
private string get_host_name () {
get_system_interface_instance ();
if (system_interface == null) { // Non-null even on Artix!
return GLib.Environment.get_host_name ();
} |
|
What if we force |
|
Please check this: private string get_host_name () {
get_system_interface_instance ();
if (system_interface != null) {
string? hostname = system_interface.pretty_hostname;
if (hostname == null || hostname.length == 0) {
hostname = system_interface.static_hostname;
}
return hostname ?? GLib.Environment.get_host_name ();
}
return GLib.Environment.get_host_name ();
} |
|
Yes, that would be a simple fix for this. I was wondering if we can check for existence of a name owner but my code has a racing issue so your idea would be a better solution here. https://github.com/elementary/switchboard-plug-about/tree/research/ryonakano/fix-fallback |
|
Excellent! It works! Thank you very much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #239
Fixes #338
@pibiba Could you test this PR if this really fix #338, using an environment without your workarounds like oem.conf? I haven't experienced Pantheon on Artix.