diff options
| author | Burt P <pburt0@gmail.com> | 2017-08-15 14:30:20 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2017-08-27 08:21:05 -0700 |
| commit | 767737a6c2776ce020796ba00410fcc91dc58076 (patch) | |
| tree | 35d5cb817afba2a1ce2b962548b40772ae09b8a5 /modules/devices.c | |
| parent | 498d86fac0bd419bd0695f5640cf4d96dc5c575a (diff) | |
devices: use dmi_get_str() in get_motherboard()
Now that group names are translatable, this seems a better
way.
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/devices.c')
| -rw-r--r-- | modules/devices.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/modules/devices.c b/modules/devices.c index 9c7a184d..7b848354 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -360,23 +360,29 @@ gchar *get_memory_total(void) gchar *get_motherboard(void) { char *board_name, *board_vendor, *product_version; + char *ret; #if defined(ARCH_x86) || defined(ARCH_x86_64) scan_dmi(FALSE); - board_name = moreinfo_lookup("DEV:DMI:Board:Name"); - board_vendor = moreinfo_lookup("DEV:DMI:Board:Vendor"); - product_version = moreinfo_lookup("DEV:DMI:Product:Version#1"); + board_name = dmi_get_str("baseboard-product-name"); + board_vendor = dmi_get_str("baseboard-manufacturer"); + product_version = dmi_get_str("system-product-version"); if (!board_name || !*board_name) board_name = _(" (model unknown)"); if (!board_vendor || !*board_vendor) board_vendor = _(" (vendor unknown)"); - if (product_version && *product_version) - return g_strdup_printf("%s / %s (%s)", product_version, board_name, board_vendor); + if (product_version && strlen(product_version) ) + ret = g_strdup_printf("%s / %s (%s)", product_version, board_name, board_vendor); + else + ret = g_strconcat(board_vendor, " ", board_name, NULL); - return g_strconcat(board_vendor, " ", board_name, NULL); + free(board_name); + free(board_vendor); + free(product_version); + return ret; #endif /* use device tree "model" */ |