From 836922b13365e2682bbc0e286ee1007ddfee42f3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 7 Mar 2019 15:03:49 +1000
Subject: [PATCH] ratbagd: fix property update notifications

Don't send property updates for props that don't exist anymore.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 ratbagd/ratbagd-button.c | 27 +++------------------------
 tools/ratbagd.py         |  2 +-
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/ratbagd/ratbagd-button.c b/ratbagd/ratbagd-button.c
index 341d4390..eb55bce2 100644
--- a/ratbagd/ratbagd-button.c
+++ b/ratbagd/ratbagd-button.c
@@ -87,17 +87,10 @@ static int ratbagd_button_set_button(sd_bus *bus,
 	r = ratbag_button_set_button(button->lib_button, map);
 
 	if (r == 0) {
-		sd_bus *bus = sd_bus_message_get_bus(m);
 		sd_bus_emit_properties_changed(bus,
 					       button->path,
 					       RATBAGD_NAME_ROOT ".Button",
-					       "ButtonMapping",
-					       NULL);
-
-		sd_bus_emit_properties_changed(bus,
-					       button->path,
-					       RATBAGD_NAME_ROOT ".Button",
-					       "ActionType",
+					       "Mapping",
 					       NULL);
 	}
 
@@ -146,17 +139,10 @@ static int ratbagd_button_set_special(sd_bus *bus,
 	r = ratbag_button_set_special(button->lib_button, special);
 
 	if (r == 0) {
-		sd_bus *bus = sd_bus_message_get_bus(m);
 		sd_bus_emit_properties_changed(bus,
 					       button->path,
 					       RATBAGD_NAME_ROOT ".Button",
-					       "SpecialMapping",
-					       NULL);
-
-		sd_bus_emit_properties_changed(bus,
-					       button->path,
-					       RATBAGD_NAME_ROOT ".Button",
-					       "ActionType",
+					       "Mapping",
 					       NULL);
 	}
 
@@ -261,17 +247,10 @@ static int ratbagd_button_set_macro(sd_bus *bus,
 	}
 
 	if (r == 0) {
-		sd_bus *bus = sd_bus_message_get_bus(m);
 		sd_bus_emit_properties_changed(bus,
 					       button->path,
 					       RATBAGD_NAME_ROOT ".Button",
-					       "Macro",
-					       NULL);
-
-		sd_bus_emit_properties_changed(bus,
-					       button->path,
-					       RATBAGD_NAME_ROOT ".Button",
-					       "ActionType",
+					       "Mapping",
 					       NULL);
 	}
 
diff --git a/tools/ratbagd.py b/tools/ratbagd.py
index 28437bf6..121eb334 100644
--- a/tools/ratbagd.py
+++ b/tools/ratbagd.py
@@ -663,7 +663,7 @@ class RatbagdButton(_RatbagdDBus):
         _RatbagdDBus.__init__(self, "Button", object_path)
 
     def _on_properties_changed(self, proxy, changed_props, invalidated_props):
-        if "ActionType" in changed_props.keys():
+        if "Mapping" in changed_props.keys():
             self.notify("action-type")
 
     def _mapping(self):