[gnome-battery-bench] gbb info: report the name of batteries

[Christian Kellner <gicmo src gnome org>]

commit 9a45d3d070556c853b8ea73f2c5a50056a29e21f
Author: Christian Kellner <christian kellner me>
Date:   Fri Mar 31 15:55:07 2017 +0200

    gbb info: report the name of batteries

 src/commandline.c |    3 +++
 src/system-info.c |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/src/commandline.c b/src/commandline.c
index 6e2dc14..c629b8d 100644
--- a/src/commandline.c
+++ b/src/commandline.c
@@ -36,6 +36,7 @@ static GOptionEntry info_options[] =
 static void
 info_txt_battery(GbbBattery *bat, const char *prefix)
 {
+    g_autofree char *name = NULL;
     g_autofree char *vendor = NULL;
     g_autofree char *model = NULL;
     double volt_design;
@@ -43,6 +44,7 @@ info_txt_battery(GbbBattery *bat, const char *prefix)
     double energy_full_design;
 
     g_object_get(bat,
+                 "name", &name,
                  "vendor", &vendor,
                  "model", &model,
                  "voltage-design", &volt_design,
@@ -51,6 +53,7 @@ info_txt_battery(GbbBattery *bat, const char *prefix)
                  NULL);
 
     g_print("%s Battery:\n", prefix);
+    g_print("%s   Name: %s\n", prefix, name);
     g_print("%s   Vendor: %s\n", prefix, vendor);
     g_print("%s   Model: %s\n", prefix, model);
     g_print("%s   Voltage Design: %5.2f V\n", prefix, volt_design);
diff --git a/src/system-info.c b/src/system-info.c
index 9cee288..eb50f57 100644
--- a/src/system-info.c
+++ b/src/system-info.c
@@ -601,6 +601,7 @@ gbb_system_info_to_json (const GbbSystemInfo *info, JsonBuilder *builder)
             json_builder_begin_array(builder);
             for (int i = 0; i < info->batteries->len; i++) {
                 GbbBattery *bat = g_ptr_array_index(info->batteries, i);
+                g_autofree char *name = NULL;
                 g_autofree char *vendor = NULL;
                 g_autofree char *model = NULL;
                 double volt_design;
@@ -608,6 +609,7 @@ gbb_system_info_to_json (const GbbSystemInfo *info, JsonBuilder *builder)
                 double energy_full_design;
 
                 g_object_get(bat,
+                             "name", &name,
                              "vendor", &vendor,
                              "model", &model,
                              "voltage-design", &volt_design,
@@ -616,6 +618,10 @@ gbb_system_info_to_json (const GbbSystemInfo *info, JsonBuilder *builder)
                              NULL);
 
                 json_builder_begin_object(builder);
+
+                json_builder_set_member_name(builder, "name");
+                json_builder_add_string_value(builder, name);
+
                 json_builder_set_member_name(builder, "vendor");
                 json_builder_add_string_value(builder, vendor);