[geary/cherry-pick-58175487] Merge branch 'fix-inspector-system-info' into 'mainline'
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/cherry-pick-58175487] Merge branch 'fix-inspector-system-info' into 'mainline'
- Date: Mon, 1 Feb 2021 12:52:03 +0000 (UTC)
commit d732c17f2e5e1d00eabb32cb2caa0f2cef3c83ce
Author: Michael Gratton <mike vee net>
Date: Sun Jan 31 01:04:56 2021 +0000
Merge branch 'fix-inspector-system-info' into 'mainline'
application-client: Check for null when getting os info
See merge request GNOME/geary!651
(cherry picked from commit 581754872a518f158426b8c97c7adbdb402bbfc0)
c524e177 application-client: Check for null when getting os info
src/client/application/application-client.vala | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
index 2bf4e094c..5f41eceda 100644
--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
@@ -291,12 +291,14 @@ public class Application.Client : Gtk.Application {
/// Application runtime information label
info.add({ _("Distribution name"),
- GLib.Environment.get_os_info(GLib.OsInfoKey.NAME)
+ GLib.Environment.get_os_info(GLib.OsInfoKey.NAME) ??
+ _("Unknown")
});
/// Application runtime information label
info.add({_("Distribution release"),
- GLib.Environment.get_os_info(GLib.OsInfoKey.VERSION)
+ GLib.Environment.get_os_info(GLib.OsInfoKey.VERSION) ??
+ _("Unknown")
});
/// Application runtime information label
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]