Commit 3224d9bb authored by Mirsal Ennaime's avatar Mirsal Ennaime

Move the MPRIS Quit method to the root dbus object.

This closes #1565
parent 469cfd7e
...@@ -632,6 +632,7 @@ DBUS_METHOD( handle_root ) ...@@ -632,6 +632,7 @@ DBUS_METHOD( handle_root )
METHOD_FUNC( "Identity", Identity ); METHOD_FUNC( "Identity", Identity );
METHOD_FUNC( "MprisVersion", MprisVersion ); METHOD_FUNC( "MprisVersion", MprisVersion );
METHOD_FUNC( "Quit", Quit );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
...@@ -647,7 +648,6 @@ DBUS_METHOD( handle_player ) ...@@ -647,7 +648,6 @@ DBUS_METHOD( handle_player )
METHOD_FUNC( "Prev", Prev ); METHOD_FUNC( "Prev", Prev );
METHOD_FUNC( "Next", Next ); METHOD_FUNC( "Next", Next );
METHOD_FUNC( "Quit", Quit );
METHOD_FUNC( "Stop", Stop ); METHOD_FUNC( "Stop", Stop );
METHOD_FUNC( "Play", Play ); METHOD_FUNC( "Play", Play );
METHOD_FUNC( "Pause", Pause ); METHOD_FUNC( "Pause", Pause );
......
...@@ -101,6 +101,8 @@ const char* psz_introspection_xml_data_root = ...@@ -101,6 +101,8 @@ const char* psz_introspection_xml_data_root =
" <method name=\"MprisVersion\">\n" " <method name=\"MprisVersion\">\n"
" <arg type=\"(qq)\" direction=\"out\" />\n" " <arg type=\"(qq)\" direction=\"out\" />\n"
" </method>\n" " </method>\n"
" <method name=\"Quit\">\n"
" </method>\n"
" </interface>\n" " </interface>\n"
"</node>\n" "</node>\n"
; ;
...@@ -118,8 +120,6 @@ const char* psz_introspection_xml_data_player = ...@@ -118,8 +120,6 @@ const char* psz_introspection_xml_data_player =
" <method name=\"GetStatus\">\n" " <method name=\"GetStatus\">\n"
" <arg type=\"(iiii)\" direction=\"out\" />\n" " <arg type=\"(iiii)\" direction=\"out\" />\n"
" </method>\n" " </method>\n"
" <method name=\"Quit\">\n"
" </method>\n"
" <method name=\"Prev\">\n" " <method name=\"Prev\">\n"
" </method>\n" " </method>\n"
" <method name=\"Next\">\n" " <method name=\"Next\">\n"
......
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