Commit 771fba73 authored by Hans de Goede's avatar Hans de Goede

media-keys: Fix MprisController no longer working

Since commit e4297f2a ("media-keys: Use G_DECLARE_FINAL_TYPE for
MprisController"), the MPRIS support in g-s-d no longer works.

This is caused by the mpris_proxy_ready_cb changes, after the troublesome
commit, the MprisController self pointer is retreived by
the mpris_proxy_ready_cb like this:

      MprisController *self = MPRIS_CONTROLLER (object);

But the object parameter to the GAsyncReadyCallback is the source object,
which in this case is the just created GDBusProxy, not our MprisController
object, leading to these warnings:

gsd-media-keys[x]: invalid cast from 'GDBusProxy' to 'MprisController'

Our MprisController is passed through the user_data pointer, so
this commit fixes the code to use this instead.

This fixes the warning and more importantly also makes the MPRIS support work
again, since it now will now properly set self->mpris_client_proxy again.

Fixes: #437
parent 0402e60e
Pipeline #104302 failed with stages
in 7 minutes and 46 seconds
......@@ -122,7 +122,7 @@ mpris_proxy_ready_cb (GObject *object,
GAsyncResult *res,
gpointer user_data)
MprisController *self = MPRIS_CONTROLLER (object);
MprisController *self = MPRIS_CONTROLLER (user_data);
GError *error = NULL;
GDBusProxy *proxy;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment