aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/desktop.vala18
-rw-r--r--src/profile.vala9
2 files changed, 9 insertions, 18 deletions
diff --git a/src/desktop.vala b/src/desktop.vala
index 6e69bb4..f764290 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -102,14 +102,11 @@ class Desktop: Profile
{
debug (@"creating action for $action_name");
var a = new SimpleAction.stateful (action_name,
- null,
+ VariantType.BOOLEAN,
new Variant.boolean (device.is_connected));
- a.activate.connect (()
- => a.set_state (new Variant.boolean (!a.get_state().get_boolean())));
-
- a.notify["state"].connect (()
- => bluetooth.set_device_connected (id, a.get_state().get_boolean()));
+ a.activate.connect ((action, state)
+ => bluetooth.set_device_connected (id, state.get_boolean()));
connect_actions.insert (device.id, a);
action_group.add_action (a);
@@ -255,14 +252,11 @@ class Desktop: Profile
Action create_discoverable_action (Bluetooth bluetooth)
{
var action = new SimpleAction.stateful ("desktop-discoverable",
- null,
+ VariantType.BOOLEAN,
new Variant.boolean (bluetooth.discoverable));
- action.activate.connect (()
- => action.set_state (new Variant.boolean (!action.get_state().get_boolean())));
-
- action.notify["state"].connect (()
- => bluetooth.try_set_discoverable (action.get_state().get_boolean()));
+ action.activate.connect ((action, state)
+ => bluetooth.try_set_discoverable (state.get_boolean()));
bluetooth.notify["discoverable"].connect (()
=> action.set_state (new Variant.boolean (bluetooth.discoverable)));
diff --git a/src/profile.vala b/src/profile.vala
index 921b573..c52481f 100644
--- a/src/profile.vala
+++ b/src/profile.vala
@@ -123,14 +123,11 @@ class Profile: Object
protected Action create_enabled_action (Bluetooth bluetooth)
{
var action = new SimpleAction.stateful ("bluetooth-enabled",
- null,
+ VariantType.BOOLEAN,
new Variant.boolean (bluetooth.enabled));
- action.activate.connect (()
- => action.change_state (new Variant.boolean (!action.get_state().get_boolean())));
-
- action.change_state.connect ((action, requestedValue)
- => bluetooth.try_set_enabled (requestedValue.get_boolean()));
+ action.activate.connect ((action, state)
+ => bluetooth.try_set_enabled (state.get_boolean()));
bluetooth.notify["enabled"].connect (()
=> action.set_state (new Variant.boolean (bluetooth.enabled)));