Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Martin Koch
wireplumber
Commits
d11c67fe
Commit
d11c67fe
authored
May 28, 2020
by
Julian Bouzas
Browse files
dbus-device-reservation: change the forced param type from the 'release' signal to boolean
parent
811ccc9f
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/module-device-activation/dbus-device-reservation.c
View file @
d11c67fe
...
...
@@ -72,7 +72,7 @@ handle_method_call (GDBusConnection *connection, const char *sender,
if
(
self
->
pending_release
)
wp_dbus_device_reservation_complete_release
(
self
,
FALSE
);
self
->
pending_release
=
g_object_ref
(
invocation
);
g_signal_emit
(
self
,
device_reservation_signals
[
SIGNAL_RELEASE
],
0
,
0
);
g_signal_emit
(
self
,
device_reservation_signals
[
SIGNAL_RELEASE
],
0
,
FALSE
);
}
else
{
wp_dbus_device_reservation_complete_release
(
self
,
FALSE
);
}
...
...
@@ -301,7 +301,7 @@ wp_dbus_device_reservation_class_init (WpDbusDeviceReservationClass * klass)
/* Signals */
device_reservation_signals
[
SIGNAL_RELEASE
]
=
g_signal_new
(
"release"
,
G_TYPE_FROM_CLASS
(
klass
),
G_SIGNAL_RUN_FIRST
,
0
,
NULL
,
NULL
,
NULL
,
G_TYPE_NONE
,
1
,
G_TYPE_
INT
);
0
,
NULL
,
NULL
,
NULL
,
G_TYPE_NONE
,
1
,
G_TYPE_
BOOLEAN
);
}
WpDbusDeviceReservation
*
...
...
modules/module-device-activation/reserve-device.c
View file @
d11c67fe
...
...
@@ -67,7 +67,7 @@ on_reservation_acquired (GObject *obj, GAsyncResult *res, gpointer user_data)
}
static
void
on_reservation_release
(
WpDbusDeviceReservation
*
reservation
,
int
forced
,
on_reservation_release
(
WpDbusDeviceReservation
*
reservation
,
gboolean
forced
,
WpReserveDevice
*
self
)
{
g_autoptr
(
WpProxy
)
device
=
NULL
;
...
...
tests/modules/dbus-device-reservation.c
View file @
d11c67fe
...
...
@@ -37,7 +37,7 @@ test_dbus_teardown (TestDbusFixture *self, gconstpointer data)
static
void
on_reservation_release
(
WpDbusDeviceReservation
*
reservation
,
int
forced
,
TestDbusFixture
*
self
)
gboolean
forced
,
TestDbusFixture
*
self
)
{
wp_dbus_device_reservation_release
(
reservation
);
wp_dbus_device_reservation_complete_release
(
reservation
,
TRUE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment