fix #179: power profiles missing profile key

2 files changed, 10 insertions, 5 deletions

diff --git a/lib/powerprofiles/cli.vala b/lib/powerprofiles/cli.vala
index 1e5cc70..87ffe82 100644
--- a/lib/powerprofiles/cli.vala
+++ b/lib/powerprofiles/cli.vala
@@ -100,7 +100,7 @@ string to_json_string(AstalPowerProfiles.PowerProfiles profiles) {
     foreach (var prof in profiles.profiles) {
         profs.add_value(new Json.Builder()
             .begin_object()
-            .set_member_name("profie").add_string_value(prof.profile)
+            .set_member_name("profile").add_string_value(prof.profile)
             .set_member_name("driver").add_string_value(prof.driver)
             .set_member_name("cpu_driver").add_string_value(prof.cpu_driver)
             .set_member_name("platform_driver").add_string_value(prof.platform_driver)
diff --git a/lib/powerprofiles/power-profiles.vala b/lib/powerprofiles/power-profiles.vala
index a104d2e..931fc04 100644
--- a/lib/powerprofiles/power-profiles.vala
+++ b/lib/powerprofiles/power-profiles.vala
@@ -113,6 +113,11 @@ public class PowerProfiles : Object {
         owned get { return proxy.performance_degraded; }
     }
 
+    private string? get_hashtable_string(HashTable<string, Variant> table, string key) {
+        var v = table.get(key);
+        return v == null ? null : v.get_string();
+    }
+
     /**
      * List of each profile.
      */
@@ -122,10 +127,10 @@ public class PowerProfiles : Object {
             for (var i = 0; i < proxy.profiles.length; ++i) {
                 var prof = proxy.profiles[i];
                 profs[i] = Profile() {
-                    profile = prof.get("Profile").get_string(),
-                    cpu_driver = prof.get("CpuDriver").get_string(),
-                    platform_driver = prof.get("PlatformDriver").get_string(),
-                    driver = prof.get("Driver").get_string()
+                    profile = get_hashtable_string(prof, "Profile"),
+                    cpu_driver = get_hashtable_string(prof, "CpuDriver"),
+                    platform_driver = get_hashtable_string(prof, "PlatformDriver"),
+                    driver = get_hashtable_string(prof, "Driver"),
                 };
             }
             return profs;