drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 15:14:38 +01:00
Code Issues Projects Releases Wiki Activity

device: switch active profile over to return an index only

Browse Source 
Returning the object path makes it harder for the client to identify which
object is the active one. A simple index into the devices array is easier to
handle.

Note: another approach was to have an IsActive property on the profile
directly. This would require updating all properties when the active profile
is changed, it's simpler to just have one index.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2016-02-16 16:51:23 +10:00
parent 7aca92f2b3
commit c04f1b57aa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ratbagd-device.c
View File

@@ -205,12 +205,12 @@ static int ratbagd_device_get_active_profile(sd_bus *bus,
if (!ratbagd_profile_is_active(profile))
continue;
return sd_bus_message_append(reply, "o",
ratbagd_profile_get_path(profile));
return sd_bus_message_append(reply, "u", i);
}
/* Eww, we want 'maybe' types here! */
return sd_bus_message_append(reply, "o", "/");
fprintf(stderr, "Unable to find active profile for %s\n",
device->name);
return sd_bus_message_append(reply, "u", 0);
}
static int ratbagd_device_get_profile_by_index(sd_bus_message *m,
@@ -240,7 +240,7 @@ const sd_bus_vtable ratbagd_device_vtable[] = {
SD_BUS_PROPERTY("Description", "s", ratbagd_device_get_description, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Svg", "s", ratbagd_device_get_svg, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Profiles", "ao", ratbagd_device_get_profiles, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("ActiveProfile", "o", ratbagd_device_get_active_profile, 0, 0),
SD_BUS_PROPERTY("ActiveProfile", "u", ratbagd_device_get_active_profile, 0, 0),
SD_BUS_METHOD("GetProfileByIndex", "u", "o", ratbagd_device_get_profile_by_index, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END,
};